File tree Expand file tree Collapse file tree 6 files changed +284
-286
lines changed
src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension Expand file tree Collapse file tree 6 files changed +284
-286
lines changed Load Diff Large diffs are not rendered by default.
Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change @@ -38,14 +38,9 @@ steps:
38
38
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
39
39
fi
40
40
41
- runtimeOsArgs=
42
- if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then
43
- runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}'
44
- fi
45
-
46
- baseOsArgs=
47
- if [ '${{ parameters.platform.baseOS }}' != '' ]; then
48
- baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}'
41
+ baseRidArgs=
42
+ if [ '${{ parameters.platform.baseRID }}' != '' ]; then
43
+ baseRidArgs='/p:BaseRid=${{ parameters.platform.baseRID }}'
49
44
fi
50
45
51
46
portableBuildArgs=
59
54
${{ parameters.platform.buildArguments }} \
60
55
$internalRuntimeDownloadArgs \
61
56
$targetRidArgs \
62
- $runtimeOsArgs \
63
- $baseOsArgs \
57
+ $baseRidArgs \
64
58
$portableBuildArgs \
65
59
/p:DotNetBuildSourceOnly=true \
66
60
/p:DotNetBuildRepo=true \
Original file line number Diff line number Diff line change 5
5
# CI mode - set to true on CI server for PR validation build or official build.
6
6
ci=${ci:- false}
7
7
8
+ # Build mode
9
+ source_build=${source_build:- false}
10
+
8
11
# Set to true to use the pipelines logger which will enable Azure logging output.
9
12
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
10
13
# This flag is meant as a temporary opt-opt for the feature while validate it across
@@ -58,7 +61,8 @@ use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
58
61
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:- ' v1' }
59
62
60
63
# True to use global NuGet cache instead of restoring packages to repository-local directory.
61
- if [[ " $ci " == true ]]; then
64
+ # Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props.
65
+ if [[ " $ci " == true || " $source_build " == true ]]; then
62
66
use_global_nuget_cache=${use_global_nuget_cache:- false}
63
67
else
64
68
use_global_nuget_cache=${use_global_nuget_cache:- true}
Original file line number Diff line number Diff line change 27
27
"jdk" : " latest"
28
28
},
29
29
"msbuild-sdks" : {
30
- "Microsoft.DotNet.Arcade.Sdk" : " 10.0.0-beta.25257.101 " ,
31
- "Microsoft.DotNet.Helix.Sdk" : " 10.0.0-beta.25257.101 " ,
32
- "Microsoft.DotNet.SharedFramework.Sdk" : " 10.0.0-beta.25257.101 " ,
30
+ "Microsoft.DotNet.Arcade.Sdk" : " 10.0.0-beta.25260.104 " ,
31
+ "Microsoft.DotNet.Helix.Sdk" : " 10.0.0-beta.25260.104 " ,
32
+ "Microsoft.DotNet.SharedFramework.Sdk" : " 10.0.0-beta.25260.104 " ,
33
33
"Microsoft.Build.NoTargets" : " 3.7.0" ,
34
34
"Microsoft.Build.Traversal" : " 3.4.0"
35
35
}
Original file line number Diff line number Diff line change 65
65
Targets =" _VmrBuild" />
66
66
<MSBuild Projects =" ..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
67
67
BuildInParallel =" false"
68
- Properties =" Platform=x86;TargetRid=win-x86;BaseOS =win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
68
+ Properties =" Platform=x86;TargetRid=win-x86;BaseRid =win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86"
69
69
Targets =" _VmrBuild" />
70
70
<MSBuild Projects =" ..\..\..\LoggingBranch\LB.csproj"
71
71
BuildInParallel =" false"
72
72
Properties =" Platform=x64;DisableTransitiveFrameworkReferences=true"
73
73
Targets =" _VmrBuild" />
74
74
<MSBuild Projects =" ..\..\..\LoggingBranch\LB.csproj"
75
75
BuildInParallel =" false"
76
- Properties =" Platform=x86;TargetRid=win-x86;BaseOS =win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
76
+ Properties =" Platform=x86;TargetRid=win-x86;BaseRid =win-x86;TargetRuntimeIdentifier=win-x86;TargetArchitecture=x86;DisableTransitiveFrameworkReferences=true"
77
77
Targets =" _VmrBuild" />
78
78
</Target >
79
79
112
112
</ItemGroup >
113
113
114
114
<ItemGroup Condition =" '$(DotNetBuild)' == 'true'" >
115
- <_SiteExtensionsReference Include =" $(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
115
+ <_SiteExtensionsReference Include =" $(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
116
116
Name =" Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64" />
117
117
<_SiteExtensionsReference Include =" $(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
118
118
Name =" Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86" />
148
148
<Content Include =" $(MicrosoftWebXdtExtensionsPath)" PackagePath =" content" />
149
149
</ItemGroup >
150
150
</Target >
151
- </Project >
151
+ </Project >
You can’t perform that action at this time.
0 commit comments