Merged PR 36036: Merge public release/8.0.1xx into internal

Manual merge from public due to conflicts discovered by https://dev.azure.com/dnceng/internal/_build/results?buildId=2335710&view=results

Resolves:
  - https://github.com/dotnet/source-build/issues/3802
  - https://github.com/dotnet/source-build/issues/3804
This commit is contained in:
Oleksandr Didyk 2023-12-20 13:49:01 +00:00
parent e67d66a029
commit 4fbf19326d
4 changed files with 1 additions and 12 deletions

View file

@ -156,6 +156,7 @@ function BootstrapArtifacts {
# Check for the version of dotnet to install
if [ "$installDotnet" == true ]; then
echo " Installing dotnet..."
use_installed_dotnet_cli=false
(source ./eng/common/tools.sh && InitializeDotNetCli true)
fi

View file

@ -111,9 +111,6 @@
<EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
<!-- https://github.com/dotnet/source-build/issues/3081 -->
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
<!-- https://github.com/dotnet/source-build/issues/3752 -->
<EnvironmentVariables Include="SuppressSymbolPackageFormatValidation=true" />
</ItemGroup>

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
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.maccatalyst/*
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/x.y.z/
./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/AppHostTemplate/