[automated] Merge branch 'release/8.0.2xx' => 'main' (#17986)

This commit is contained in:
v-wuzhai 2023-12-18 17:18:52 +08:00 committed by GitHub
commit 3ac63e7eec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 9 deletions

View file

@ -174,6 +174,7 @@ function BootstrapArtifacts {
# Check for the version of dotnet to install # Check for the version of dotnet to install
if [ "$installDotnet" == true ]; then if [ "$installDotnet" == true ]; then
echo " Installing dotnet..." echo " Installing dotnet..."
use_installed_dotnet_cli=false
(source ./eng/common/tools.sh && InitializeDotNetCli true) (source ./eng/common/tools.sh && InitializeDotNetCli true)
# TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666) # TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666)

View file

@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*?
# missing workload manifests - https://github.com/dotnet/source-build/issues/3242 # missing workload manifests - https://github.com/dotnet/source-build/issues/3242
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/*
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/*
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/*
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/*
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/* msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/*

View file

@ -44,14 +44,6 @@ index ------------
./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/
./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/
./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/
@@ ------------ @@
./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll
./sdk-manifests/
./sdk-manifests/x.y.z/
-./sdk-manifests/x.y.z/
./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/
./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/
./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json
@@ ------------ @@ @@ ------------ @@
./sdk/x.y.z/.version ./sdk/x.y.z/.version
./sdk/x.y.z/AppHostTemplate/ ./sdk/x.y.z/AppHostTemplate/