Skip to content

Commit 0e6ea88

Browse files
[main] Source code updates from dotnet/dotnet (#61843)
* [VMR] Codeflow 754e56e-754e56e [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 267468 * [VMR] Codeflow 1a7ca4a-1a7ca4a [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 267725 * Update dependencies from https://github.com/dotnet/dotnet build 267776 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 2b0e9d8 commit 0e6ea88

File tree

6 files changed

+284
-286
lines changed

6 files changed

+284
-286
lines changed

eng/Version.Details.xml

Lines changed: 181 additions & 181 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 87 additions & 87 deletions
Large diffs are not rendered by default.

eng/common/core-templates/steps/source-build.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,9 @@ steps:
3838
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
3939
fi
4040
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 }}'
4944
fi
5045
5146
portableBuildArgs=
@@ -59,8 +54,7 @@ steps:
5954
${{ parameters.platform.buildArguments }} \
6055
$internalRuntimeDownloadArgs \
6156
$targetRidArgs \
62-
$runtimeOsArgs \
63-
$baseOsArgs \
57+
$baseRidArgs \
6458
$portableBuildArgs \
6559
/p:DotNetBuildSourceOnly=true \
6660
/p:DotNetBuildRepo=true \

eng/common/tools.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# CI mode - set to true on CI server for PR validation build or official build.
66
ci=${ci:-false}
77

8+
# Build mode
9+
source_build=${source_build:-false}
10+
811
# Set to true to use the pipelines logger which will enable Azure logging output.
912
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
1013
# 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}
5861
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5962

6063
# 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
6266
use_global_nuget_cache=${use_global_nuget_cache:-false}
6367
else
6468
use_global_nuget_cache=${use_global_nuget_cache:-true}

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"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",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@
6565
Targets="_VmrBuild" />
6666
<MSBuild Projects="..\..\..\Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj"
6767
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"
6969
Targets="_VmrBuild" />
7070
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
7171
BuildInParallel="false"
7272
Properties="Platform=x64;DisableTransitiveFrameworkReferences=true"
7373
Targets="_VmrBuild" />
7474
<MSBuild Projects="..\..\..\LoggingBranch\LB.csproj"
7575
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"
7777
Targets="_VmrBuild" />
7878
</Target>
7979

@@ -112,7 +112,7 @@
112112
</ItemGroup>
113113

114114
<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"
116116
Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x64" />
117117
<_SiteExtensionsReference Include="$(ArtifactsNonShippingPackagesDir)Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86.%(_ResolvedPackageVersionInfo.PackageVersion).nupkg"
118118
Name="Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(AspNetCoreMajorMinorVersion).x86" />
@@ -148,4 +148,4 @@
148148
<Content Include="$(MicrosoftWebXdtExtensionsPath)" PackagePath="content" />
149149
</ItemGroup>
150150
</Target>
151-
</Project>
151+
</Project>

0 commit comments

Comments
 (0)