PR Feedback: Use Arcade SDK to get test parameters without passing from outer build

src/SourceBuild/content/Directory.Build.targets

@@ -19,6 +19,7 @@
     -->
     <PropertyGroup>
       <SdkFilename>%(SdkTarballItem.Filename)%(SdkTarballItem.Extension)</SdkFilename>
+      <SdkTarballPath>%(SdkTarballItem.Identity)</SdkTarballPath>
       <SourceBuiltSdkVersion>$(SdkFilename.Replace('$(SdkFilenamePrefix)','').Replace('-$(TargetRid)$(ArchiveExtension)',''))</SourceBuiltSdkVersion>
     </PropertyGroup>
   </Target>

src/SourceBuild/content/eng/build.sourcebuild.targets

@@ -40,11 +40,10 @@
 
       <IntermediateSdkSymbolsLayout>$(BaseIntermediateOutputPath)SdkSymbols</IntermediateSdkSymbolsLayout>
       <IntermediateSdkLayout>$(BaseIntermediateOutputPath)Sdk</IntermediateSdkLayout>
-      <SdkTarball>%(SdkTarballItem.Identity)</SdkTarball>
     </PropertyGroup>
 
     <MakeDir Directories="$(IntermediateSdkLayout)" />
-    <Exec Command="tar -xzf $(SdkTarball) -C $(IntermediateSdkLayout)" />
+    <Exec Command="tar -xzf $(SdkTarballPath) -C $(IntermediateSdkLayout)" />
 
     <CreateSdkSymbolsLayout SdkLayoutPath="$(IntermediateSdkLayout)"
                             AllSymbolsPath="$(IntermediateSymbolsRootDir)"

src/SourceBuild/content/eng/unifiedBuildValidation.targets

@@ -9,33 +9,10 @@
           AfterTargets="Build"
           DependsOnTargets="DetermineSourceBuiltSdkVersion">
 
-    <PropertyGroup>
-      <SdkTarballPath>%(SdkTarballItem.Identity)</SdkTarballPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.UbSdkArchivePath">
-        <Value>$(SdkTarballPath)</Value>
-      </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.TargetRid">
-        <Value>$(TargetRid)</Value>
-      </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.PortableRid">
-        <Value>$(PortableRid)</Value>
-      </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.UbBuildVersion">
-        <Value>$(SourceBuiltSdkVersion)</Value>
-      </RuntimeHostConfigurationOption>
-    </ItemGroup>
-
     <MSBuild Projects="$(UnifiedBuildValidationTestsProject)"
              Targets="VSTest"
              Properties="VsTestUseMSBuildOutput=true;
-                         VSTestLogger=trx;
-                         Microsoft_DotNet_UnifiedBuild_Tests_UbSdkArchivePath=$(SdkTarballPath);
-                         Microsoft_DotNet_UnifiedBuild_Tests_TargetRid=$(TargetRid);
-                         Microsoft_DotNet_UnifiedBuild_Tests_PortableRid=$(PortableRid);
-                         Microsoft_DotNet_UnifiedBuild_Tests_SourceBuiltSdkVersion=$(SourceBuiltSdkVersion);" />
+                         VSTestLogger=trx;" />
 
   </Target>
 

src/SourceBuild/content/test/Directory.Build.props

@@ -0,0 +1,2 @@
+<Project>
+</Project>

src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Config.cs

@@ -18,13 +18,12 @@ public class Config : IDisposable
     public Config(IMessageSink sink)
     {
         _sink = sink;
-        UbBuildVersion = AppContext.GetSwitch(BuildVersionSwitch);
-        ConfigPrefix = AppContext.GetSwitch(ConfigPrefixSwitch);
-        TargetRid = AppContext.GetSwitch(TargetRidSwitch);
-        PortableRid = AppContext.GetSwitch(PortableRidSwitch);
-        UbSdkArchivePath = AppContext.GetSwitch(UbSdkArchivePathSwitch);
+        UbBuildVersion = (string)AppContext.GetData(BuildVersionSwitch);
+        TargetRid = (string)AppContext.GetData(TargetRidSwitch);
+        PortableRid = (string)AppContext.GetData(PortableRidSwitch);
+        UbSdkArchivePath = (string)AppContext.GetData(UbSdkArchivePathSwitch);
         TargetArchitecture = TargetRid.Split('-')[1];
-        MsftSdkArchivePath = AppContext.GetSwitch(MsftSdkArchivePathSwitch) ?? DownloadMsftSdkArchive().Result;
+        MsftSdkArchivePath = AppContext.GetData(MsftSdkArchivePathSwitch) as string ?? DownloadMsftSdkArchive().Result;
     }
 
     public const string ConfigSwitchPrefix = "Microsoft.DotNet.UnifiedBuild.Tests.";

src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/Microsoft.DotNet.UnifiedBuild.Tests.csproj

@@ -1,5 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="../../Directory.Build.props" />
+  <Import Project="../../Directory.Build.targets" />
   <PropertyGroup>
     <TargetFramework>$(NetCurrent)</TargetFramework>
     <Nullable>enable</Nullable>
@@ -15,21 +17,24 @@
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <ItemGroup>
+  <Target Name="SetRuntimeConfigOptions"
+          DependsOnTargets="DetermineSourceBuiltSdkVersion"
+          BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache;Build;">
+    <ItemGroup>
+      <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.UbSdkArchivePath">
+        <Value>$(SdkTarballPath)</Value>
+      </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.TargetRid">
-        <Value>$(Microsoft_DotNet_UnifiedBuild_Tests_TargetRid)</Value>
+        <Value>$(TargetRid)</Value>
       </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.PortableRid">
-        <Value>$(Microsoft_DotNet_UnifiedBuild_Tests_PortableRid)</Value>
+        <Value>$(PortableRid)</Value>
       </RuntimeHostConfigurationOption>
       <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.UbBuildVersion">
-        <Value>$(Microsoft_DotNet_UnifiedBuild_Tests_UbBuildVersion)</Value>
+        <Value>$(SourceBuiltSdkVersion)</Value>
       </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.UbSdkArchivePath">
-        <Value>$(Microsoft_DotNet_UnifiedBuild_Tests_UbSdkArchivePath)</Value>
-      </RuntimeHostConfigurationOption>
-      <RuntimeHostConfigurationOption Include="Microsoft.DotNet.UnifiedBuild.Tests.MsftSdkArchivePath">
-        <Value>$(Microsoft_DotNet_UnifiedBuild_Tests_MsftSdkArchivePath)</Value>
-      </RuntimeHostConfigurationOption>
-  </ItemGroup>
+    </ItemGroup>
+  </Target>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 </Project>

src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/SdkContentTests.cs

@@ -23,7 +23,7 @@ public class SdkContentTests : TestBase
 {
     Exclusions Exclusions;
     public SdkContentTests(ITestOutputHelper outputHelper, Config config) : base(outputHelper, config)
-    { 
+    {
         Exclusions = new(Config.TargetRid);
     }
 
@@ -196,7 +196,7 @@ public class SdkContentTests : TestBase
         }
 
         string fileListing = Utilities.GetTarballContentNames(tarballPath).Aggregate((a, b) => $"{a}{Environment.NewLine}{b}");
-        fileListing = BaselineHelper.RemoveRids(fileListing, Config.PortableRidEnv, Config.TargetRid, isPortable);
+        fileListing = BaselineHelper.RemoveRids(fileListing, Config.PortableRid, Config.TargetRid, isPortable);
         fileListing = BaselineHelper.RemoveVersions(fileListing);
         IEnumerable<string> files = fileListing.Split(Environment.NewLine).OrderBy(path => path);
         files = Exclusions.RemoveContentDiffFileExclusions(files, sdkType);

src/SourceBuild/content/test/Microsoft.DotNet.UnifiedBuild.Tests/assets/baselines/MsftToUbSdkFiles-win-x64.diff

@@ -2,268 +2,11 @@ diff --git a/msftSdkFiles.txt b/ubSdkFiles.txt
 index ------------
 --- a/msftSdkFiles.txt
 +++ b/ubSdkFiles.txt
-@@ ------------ @@ sdk/x.y.z/Containers/tasks/netx.y/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.d
- sdk/x.y.z/Containers/tasks/netx.y/zh-Hant/Microsoft.NET.Build.Containers.resources.dll
- sdk/x.y.z/Containers/tasks/netx.y/zh-Hant/System.CommandLine.resources.dll
- sdk/x.y.z/cs/dotnet.resources.dll
--sdk/x.y.z/cs/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/cs/Microsoft.Build.resources.dll
- sdk/x.y.z/cs/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/cs/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/cs/MSBuild.resources.dll
--sdk/x.y.z/cs/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/cs/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/cs/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/cs/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/cs/NuGet.Commands.resources.dll
- sdk/x.y.z/cs/NuGet.Common.resources.dll
- sdk/x.y.z/cs/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/datacollector.dll
- sdk/x.y.z/datacollector.dll.config
- sdk/x.y.z/datacollector.runtimeconfig.json
- sdk/x.y.z/de/dotnet.resources.dll
--sdk/x.y.z/de/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/de/Microsoft.Build.resources.dll
- sdk/x.y.z/de/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/de/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/de/MSBuild.resources.dll
--sdk/x.y.z/de/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/de/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/de/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/de/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/de/NuGet.Commands.resources.dll
- sdk/x.y.z/de/NuGet.Common.resources.dll
- sdk/x.y.z/de/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/zh-Hant/Microsoft.Code
- sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll
- sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/zh-Hant/System.CommandLine.resources.dll
- sdk/x.y.z/es/dotnet.resources.dll
--sdk/x.y.z/es/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/es/Microsoft.Build.resources.dll
- sdk/x.y.z/es/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/es/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/es/MSBuild.resources.dll
--sdk/x.y.z/es/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/es/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/es/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/es/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/es/NuGet.Commands.resources.dll
- sdk/x.y.z/es/NuGet.Common.resources.dll
- sdk/x.y.z/es/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.reso
- sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll
- sdk/x.y.z/Extensions/zh-Hant/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll
- sdk/x.y.z/fr/dotnet.resources.dll
--sdk/x.y.z/fr/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/fr/Microsoft.Build.resources.dll
- sdk/x.y.z/fr/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/fr/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/fr/MSBuild.resources.dll
--sdk/x.y.z/fr/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/fr/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/fr/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/fr/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/fr/NuGet.Commands.resources.dll
- sdk/x.y.z/fr/NuGet.Common.resources.dll
- sdk/x.y.z/fr/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/FSharp/zh-Hant/FSharp.Compiler.Service.resources.dll
- sdk/x.y.z/FSharp/zh-Hant/FSharp.Core.resources.dll
- sdk/x.y.z/FSharp/zh-Hant/FSharp.DependencyManager.Nuget.resources.dll
- sdk/x.y.z/it/dotnet.resources.dll
--sdk/x.y.z/it/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/it/Microsoft.Build.resources.dll
- sdk/x.y.z/it/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/it/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/it/MSBuild.resources.dll
--sdk/x.y.z/it/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/it/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/it/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/it/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/it/NuGet.Commands.resources.dll
- sdk/x.y.z/it/NuGet.Common.resources.dll
- sdk/x.y.z/it/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/it/System.CommandLine.resources.dll
- sdk/x.y.z/it/Test.Utility.resources.dll
- sdk/x.y.z/it/vstest.console.resources.dll
- sdk/x.y.z/ja/dotnet.resources.dll
--sdk/x.y.z/ja/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/ja/Microsoft.Build.resources.dll
- sdk/x.y.z/ja/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/ja/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/ja/MSBuild.resources.dll
--sdk/x.y.z/ja/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/ja/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/ja/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/ja/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/ja/NuGet.Commands.resources.dll
- sdk/x.y.z/ja/NuGet.Common.resources.dll
- sdk/x.y.z/ja/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/ja/Test.Utility.resources.dll
- sdk/x.y.z/ja/vstest.console.resources.dll
- sdk/x.y.z/KnownWorkloadManifests.txt
- sdk/x.y.z/ko/dotnet.resources.dll
--sdk/x.y.z/ko/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/ko/Microsoft.Build.resources.dll
- sdk/x.y.z/ko/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/ko/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/ko/MSBuild.resources.dll
--sdk/x.y.z/ko/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/ko/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/ko/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/ko/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/ko/NuGet.Commands.resources.dll
- sdk/x.y.z/ko/NuGet.Common.resources.dll
- sdk/x.y.z/ko/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/NuGet.RestoreEx.targets
- sdk/x.y.z/NuGet.targets
- sdk/x.y.z/NuGet.Versioning.dll
- sdk/x.y.z/pl/dotnet.resources.dll
--sdk/x.y.z/pl/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/pl/Microsoft.Build.resources.dll
- sdk/x.y.z/pl/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/pl/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/pl/MSBuild.resources.dll
--sdk/x.y.z/pl/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/pl/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/pl/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/pl/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/pl/NuGet.Commands.resources.dll
- sdk/x.y.z/pl/NuGet.Common.resources.dll
- sdk/x.y.z/pl/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/pl/Test.Utility.resources.dll
- sdk/x.y.z/pl/vstest.console.resources.dll
- sdk/x.y.z/PortableRuntimeIdentifierGraph.json
- sdk/x.y.z/pt-BR/dotnet.resources.dll
--sdk/x.y.z/pt-BR/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/pt-BR/Microsoft.Build.resources.dll
- sdk/x.y.z/pt-BR/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/pt-BR/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/pt-BR/MSBuild.resources.dll
--sdk/x.y.z/pt-BR/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/pt-BR/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/pt-BR/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/pt-BR/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/pt-BR/NuGet.Commands.resources.dll
- sdk/x.y.z/pt-BR/NuGet.Common.resources.dll
- sdk/x.y.z/pt-BR/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/Roslyn/tr/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
- sdk/x.y.z/Roslyn/zh-Hans/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
- sdk/x.y.z/Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll
- sdk/x.y.z/ru/dotnet.resources.dll
--sdk/x.y.z/ru/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/ru/Microsoft.Build.resources.dll
- sdk/x.y.z/ru/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/ru/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/ru/MSBuild.resources.dll
--sdk/x.y.z/ru/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/ru/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/ru/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/ru/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/ru/NuGet.Commands.resources.dll
- sdk/x.y.z/ru/NuGet.Common.resources.dll
- sdk/x.y.z/ru/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.Stati
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.References.targets
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets
--sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.ServiceWorkerAssetsManifest.targets
-+sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.ServiceWorker.targets
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.SingleTargeting.targets
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Microsoft.NET.Sdk.StaticWebAssets.targets
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.StaticWebAssets/targets/Sdk.StaticWebAssets.CurrentVersion.props
-@@ ------------ @@ sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dl
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/Microsoft.NET.Sdk.Web.Tasks.dll
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/Sdk/Sdk.props
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/Sdk/Sdk.targets
-+sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/targets/Microsoft.NET.Sdk.WebAssembly.6_0.temp.targets
-+sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/targets/Microsoft.NET.Sdk.WebAssembly.9_0.temp.targets
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/tools/net472/Microsoft.NET.Sdk.WebAssembly.Tasks.dll
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/tools/netx.y/Microsoft.NET.Sdk.WebAssembly.Tasks.dll
- sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT
-@@ ------------ @@ sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.TestPlatform.Utilities.resource
- sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/TestHostNetFramework/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/tr/dotnet.resources.dll
--sdk/x.y.z/tr/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/tr/Microsoft.Build.resources.dll
- sdk/x.y.z/tr/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/tr/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/tr/MSBuild.resources.dll
--sdk/x.y.z/tr/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/tr/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/tr/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/tr/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/tr/NuGet.Commands.resources.dll
- sdk/x.y.z/tr/NuGet.Common.resources.dll
- sdk/x.y.z/tr/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/vstest.console.dll
- sdk/x.y.z/vstest.console.dll.config
- sdk/x.y.z/vstest.console.runtimeconfig.json
- sdk/x.y.z/zh-Hans/dotnet.resources.dll
--sdk/x.y.z/zh-Hans/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/zh-Hans/Microsoft.Build.resources.dll
- sdk/x.y.z/zh-Hans/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/zh-Hans/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/zh-Hans/MSBuild.resources.dll
--sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/zh-Hans/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/zh-Hans/NuGet.Commands.resources.dll
- sdk/x.y.z/zh-Hans/NuGet.Common.resources.dll
- sdk/x.y.z/zh-Hans/NuGet.Configuration.resources.dll
-@@ ------------ @@ sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll
- sdk/x.y.z/zh-Hans/Test.Utility.resources.dll
- sdk/x.y.z/zh-Hans/vstest.console.resources.dll
- sdk/x.y.z/zh-Hant/dotnet.resources.dll
--sdk/x.y.z/zh-Hant/Microsoft.Build.NuGetSdkResolver.resources.dll
- sdk/x.y.z/zh-Hant/Microsoft.Build.resources.dll
- sdk/x.y.z/zh-Hant/Microsoft.Build.Tasks.Core.resources.dll
- sdk/x.y.z/zh-Hant/Microsoft.Build.Utilities.Core.resources.dll
-@@ ------------ @@ sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Client.resources.dll
- sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll
- sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll
- sdk/x.y.z/zh-Hant/MSBuild.resources.dll
--sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.Console.resources.dll
--sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.resources.dll
--sdk/x.y.z/zh-Hant/NuGet.CommandLine.XPlat.resources.dll
-+sdk/x.y.z/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll
- sdk/x.y.z/zh-Hant/NuGet.Commands.resources.dll
- sdk/x.y.z/zh-Hant/NuGet.Common.resources.dll
- sdk/x.y.z/zh-Hant/NuGet.Configuration.resources.dll
+@@ ------------ @@ sdk/x.y.z/Microsoft.NET.Sdk.WorkloadManifestReader.dll
+ sdk/x.y.z/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll
+ sdk/x.y.z/Microsoft.NET.StringTools.dll
+ sdk/x.y.z/Microsoft.NETCoreSdk.BundledCliTools.props
+-sdk/x.y.z/Microsoft.NETCoreSdk.BundledMSBuildInformation.props
+ sdk/x.y.z/Microsoft.NETCoreSdk.BundledVersions.props
+ sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.props
+ sdk/x.y.z/Microsoft.NETFramework.CurrentVersion.targets