[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#44764)

dotnet · Nov 19, 2024 · 3cbdda9 · 3cbdda9
2 parents 77991a8 + 56f544e
commit 3cbdda9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -101,8 +101,6 @@
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
     <!-- Supported versions -->
-    <MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
     <MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24561.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/.../Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt b/.../Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt
@@ -20,7 +20,7 @@
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/|msft   # Intentional - explicitly excluded from source-build
 
 # netfx tooling and tasks, not building in source-build - https://github.com/dotnet/source-build/issues/3514
-./sdk/x.y.z/Sdks/Microsoft.Build.Tasks.Git/tools/net472/|msft
+./sdk/x.y.z/Sdks/Microsoft.Build.Tasks.Git/tools/netframework/|msft
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/|msft
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/|msft
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/|msft
@@ -30,11 +30,11 @@
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/tools/net472/|msft
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/tools/net472/|msft
 ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/tools/net472/|msft
-./sdk/x.y.z/Sdks/Microsoft.SourceLink.AzureRepos.Git/tools/net472/|msft
-./sdk/x.y.z/Sdks/Microsoft.SourceLink.Bitbucket.Git/tools/net472/|msft
-./sdk/x.y.z/Sdks/Microsoft.SourceLink.Common/tools/net472/|msft
-./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitHub/tools/net472/|msft
-./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitLab/tools/net472/|msft
+./sdk/x.y.z/Sdks/Microsoft.SourceLink.AzureRepos.Git/tools/netframework/|msft
+./sdk/x.y.z/Sdks/Microsoft.SourceLink.Bitbucket.Git/tools/netframework/|msft
+./sdk/x.y.z/Sdks/Microsoft.SourceLink.Common/tools/netframework/|msft
+./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitHub/tools/netframework/|msft
+./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitLab/tools/netframework/|msft
 
 # vstest localization is disabled in Linux builds - https://github.com/dotnet/source-build/issues/3517
 ./sdk/x.y.z/*/Microsoft.CodeCoverage.IO.resources.dll|msft