Skip to content

Commit 3ac63e7

Browse files
authored
[automated] Merge branch 'release/8.0.2xx' => 'main' (#17986)
2 parents 30f2fc1 + 0fad92f commit 3ac63e7

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

src/SourceBuild/content/prep.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ function BootstrapArtifacts {
174174
# Check for the version of dotnet to install
175175
if [ "$installDotnet" == true ]; then
176176
echo " Installing dotnet..."
177+
use_installed_dotnet_cli=false
177178
(source ./eng/common/tools.sh && InitializeDotNetCli true)
178179

179180
# TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666)

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkFileDiffExclusions.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ sb,./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/*?
4545

4646
# missing workload manifests - https://github.com/dotnet/source-build/issues/3242
4747
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.android/*
48-
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.aspire/*
4948
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.ios/*
5049
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/*
5150
msft,./sdk-manifests/x.y.z/microsoft.net.sdk.macos/*

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ index ------------
4444
./packs/Microsoft.NETCore.App.Ref/
4545
./packs/Microsoft.NETCore.App.Ref/x.y.z/
4646
./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/
47-
@@ ------------ @@
48-
./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll
49-
./sdk-manifests/
50-
./sdk-manifests/x.y.z/
51-
-./sdk-manifests/x.y.z/
52-
./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/
53-
./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/
54-
./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/x.y.z/WorkloadManifest.json
5547
@@ ------------ @@
5648
./sdk/x.y.z/.version
5749
./sdk/x.y.z/AppHostTemplate/

0 commit comments

Comments
 (0)