From 9979d00dd57facd1095abf4efad6a2bc1f760a35 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Dec 2021 10:10:05 -0800 Subject: [PATCH 01/40] Fix the logic that generates the fallback text file --- src/redist/targets/GenerateLayout.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 3917efa60..a26cad868 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -463,9 +463,13 @@ + - + + + + From 11de58ddc5881e5a10c57beb8d43dba3db155158 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 6 Feb 2022 09:41:11 -0800 Subject: [PATCH 02/40] Update .vsts-ci.yml --- .vsts-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 7fb2a509d..b0386b1bd 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -391,9 +391,9 @@ stages: - Source_Build_Create_Tarball publishUsingPipelines: true pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: From 97c7aa240b2da8bfd5eb7b5fd70c48b3ee8616b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 16:31:47 +0000 Subject: [PATCH 03/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220205.1 (#13179) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65953f6b0..dff25a08b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 93e08e378eb00a4267ffeca24b6bebb4f6c011ef - + https://github.com/dotnet/source-build-reference-packages - ff99504268983746f7d8e179eac4b88ece7f2817 + a7c8487a49a4343bcbe279ea2f7406138cf98776 From 7d14092c5ff5a3bf25be0719da5cc7b7f7a4b919 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 7 Feb 2022 09:25:08 -0800 Subject: [PATCH 04/40] Override Microsoft.Net.Sdk.WindowsDesktop references during source-build in Roslyn (#13093) * override SDK for Microsoft.Net.Sdk.WindowsDesktop references in roslyn * add new EmptySdk in the source build tarball * remove roslyn solution filter patch --- .../content/repos/Directory.Build.props | 1 + .../tarball/content/repos/roslyn.proj | 1 + .../tools-local/EmptySdk/Sdk/Sdk.props | 14 ++ .../tools-local/EmptySdk/Sdk/Sdk.targets | 9 ++ ...05-Build-a-subset-of-roslyn-projects.patch | 146 ------------------ 5 files changed, 25 insertions(+), 146 deletions(-) create mode 100644 src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props create mode 100644 src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets delete mode 100644 src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 69dab2b18..e61a6e689 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -154,5 +154,6 @@ + diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj index 6aeeebdf2..0f43286ce 100644 --- a/src/SourceBuild/tarball/content/repos/roslyn.proj +++ b/src/SourceBuild/tarball/content/repos/roslyn.proj @@ -45,6 +45,7 @@ + diff --git a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props new file mode 100644 index 000000000..25bc36ee8 --- /dev/null +++ b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.props @@ -0,0 +1,14 @@ + + + + $([MSBuild]::NormalizeDirectory('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'global.json'))')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng')) + + + + + false + + + + diff --git a/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets new file mode 100644 index 000000000..8fda6a64c --- /dev/null +++ b/src/SourceBuild/tarball/content/tools-local/EmptySdk/Sdk/Sdk.targets @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch b/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch deleted file mode 100644 index 275d6dcec..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0005-Build-a-subset-of-roslyn-projects.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 110fc28ea7c17d57bbd5ce8ed3fc4e2b0274c5b3 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Fri, 22 Oct 2021 22:17:37 +0000 -Subject: [PATCH] Build a subset of roslyn projects - -Some projects use Microsoft.NET.Sdk.WindowsDesktop sdk -which cannot be built using a boostrapped source-build -sdk, since WindowsDesktop is not supported. These cannot -be ignored using ExcludeFromSourceBuild because the project -still needs to be loaded and the sdk cannot be found. - -See https://github.com/dotnet/roslyn/issues/57342 ---- - Roslyn.SourceBuild.slnf | 105 ++++++++++++++++++++++++++++++++++++++++ - eng/SourceBuild.props | 2 +- - 2 files changed, 106 insertions(+), 1 deletion(-) - create mode 100644 Roslyn.SourceBuild.slnf - -diff --git a/Roslyn.SourceBuild.slnf b/Roslyn.SourceBuild.slnf -new file mode 100644 -index 00000000000..e6f8eb315bf ---- /dev/null -+++ b/Roslyn.SourceBuild.slnf -@@ -0,0 +1,105 @@ -+{ -+ "solution": { -+ "path": "Roslyn.sln", -+ "projects": [ -+ "src\\Deployment\\RoslynDeployment.csproj", -+ "src\\Compilers\\Core\\Portable\\Microsoft.CodeAnalysis.csproj", -+ "src\\Compilers\\Server\\VBCSCompiler\\VBCSCompiler.csproj", -+ "src\\Compilers\\CSharp\\csc\\csc.csproj", -+ "src\\Compilers\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.csproj", -+ "src\\Compilers\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.vbproj", -+ "src\\Workspaces\\Core\\Portable\\Microsoft.CodeAnalysis.Workspaces.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\BoundTreeGenerator\\CompilersBoundTreeGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpErrorFactsGenerator\\CSharpErrorFactsGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpSyntaxGenerator\\CSharpSyntaxGenerator.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicSyntaxGenerator\\VisualBasicSyntaxGenerator.vbproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicErrorFactsGenerator\\VisualBasicErrorFactsGenerator.vbproj", -+ "src\\Workspaces\\Core\\Desktop\\Microsoft.CodeAnalysis.Workspaces.Desktop.csproj", -+ "src\\Workspaces\\Core\\MSBuild\\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj", -+ "src\\Workspaces\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj", -+ "src\\Workspaces\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj", -+ "src\\Features\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj", -+ "src\\Features\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Features.csproj", -+ "src\\Features\\Core\\Portable\\Microsoft.CodeAnalysis.Features.csproj", -+ "src\\Scripting\\VisualBasic\\Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj", -+ "src\\Scripting\\Core\\Microsoft.CodeAnalysis.Scripting.csproj", -+ "src\\Scripting\\CSharp\\Microsoft.CodeAnalysis.CSharp.Scripting.csproj", -+ "src\\ExpressionEvaluator\\Package\\ExpressionEvaluatorPackage.csproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.ExpressionCompiler.csproj", -+ "src\\Compilers\\Core\\AnalyzerDriver\\AnalyzerDriver.shproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\BasicResultProvider.shproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\NetFX20\\BasicResultProvider.NetFX20.vbproj", -+ "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\CSharpResultProvider.shproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\NetFX20\\CSharpResultProvider.NetFX20.csproj", -+ "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\ResultProvider.shproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\NetFX20\\ResultProvider.NetFX20.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.ResultProvider.csproj", -+ "src\\Compilers\\VisualBasic\\vbc\\vbc.csproj", -+ "src\\Compilers\\VisualBasic\\BasicAnalyzerDriver\\BasicAnalyzerDriver.shproj", -+ "src\\Compilers\\CSharp\\CSharpAnalyzerDriver\\CSharpAnalyzerDriver.shproj", -+ "src\\Compilers\\Core\\CommandLine\\CommandLine.shproj", -+ "src\\Compilers\\Extension\\Roslyn.Compilers.Extension.csproj", -+ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.shproj", -+ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.shproj", -+ "src\\Workspaces\\Remote\\Core\\Microsoft.CodeAnalysis.Remote.Workspaces.csproj", -+ "src\\Workspaces\\Remote\\ServiceHub\\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj", -+ "src\\Compilers\\Core\\MSBuildTask\\Microsoft.Build.Tasks.CodeAnalysis.csproj", -+ "src\\Tools\\BuildBoss\\BuildBoss.csproj", -+ "src\\ExpressionEvaluator\\Core\\Source\\FunctionResolver\\Microsoft.CodeAnalysis.FunctionResolver.csproj", -+ "src\\CodeStyle\\Core\\Analyzers\\Microsoft.CodeAnalysis.CodeStyle.csproj", -+ "src\\CodeStyle\\Core\\CodeFixes\\Microsoft.CodeAnalysis.CodeStyle.Fixes.csproj", -+ "src\\CodeStyle\\CSharp\\Analyzers\\Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj", -+ "src\\CodeStyle\\CSharp\\CodeFixes\\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj", -+ "src\\CodeStyle\\VisualBasic\\Analyzers\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.vbproj", -+ "src\\CodeStyle\\VisualBasic\\CodeFixes\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj", -+ "src\\Tools\\AnalyzerRunner\\AnalyzerRunner.csproj", -+ "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.Package.csproj", -+ "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.Package.csproj", -+ "src\\NuGet\\Microsoft.Net.Compilers\\Microsoft.Net.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.NETCore.Compilers\\Microsoft.NETCore.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Compilers.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Scripting.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.EditorFeatures.Package.csproj", -+ "src\\NuGet\\Microsoft.CodeAnalysis.Package.csproj", -+ "src\\Setup\\DevDivVsix\\CompilersPackage\\Microsoft.CodeAnalysis.Compilers.Setup.csproj", -+ "src\\Setup\\Installer\\Installer.Package.csproj", -+ "src\\Setup\\DevDivInsertionFiles\\DevDivInsertionFiles.csproj", -+ "src\\Tools\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj", -+ "src\\Tools\\ExternalAccess\\Razor\\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj", -+ "src\\NuGet\\Microsoft.Net.Compilers.Toolset\\Microsoft.Net.Compilers.Toolset.Package.csproj", -+ "src\\Features\\LanguageServer\\Protocol\\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj", -+ "src\\Tools\\ExternalAccess\\Debugger\\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj", -+ "src\\Tools\\ExternalAccess\\Xamarin.Remote\\Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj", -+ "src\\Tools\\ExternalAccess\\Apex\\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj", -+ "src\\Tools\\IdeBenchmarks\\IdeBenchmarks.csproj", -+ "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\IOperationGenerator\\CompilersIOperationGenerator.csproj", -+ "src\\Features\\Lsif\\Generator\\Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\Core\\CompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\Core\\WorkspaceExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\CSharp\\CSharpCompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\CSharp\\CSharpWorkspaceExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\VisualBasic\\VisualBasicCompilerExtensions.shproj", -+ "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\VisualBasic\\VisualBasicWorkspaceExtensions.shproj", -+ "src\\Analyzers\\Core\\Analyzers\\Analyzers.shproj", -+ "src\\Analyzers\\Core\\CodeFixes\\CodeFixes.shproj", -+ "src\\Analyzers\\CSharp\\Analyzers\\CSharpAnalyzers.shproj", -+ "src\\Analyzers\\CSharp\\CodeFixes\\CSharpCodeFixes.shproj", -+ "src\\Analyzers\\VisualBasic\\Analyzers\\VisualBasicAnalyzers.shproj", -+ "src\\Analyzers\\VisualBasic\\CodeFixes\\VisualBasicCodeFixes.shproj", -+ "src\\Tools\\IdeCoreBenchmarks\\IdeCoreBenchmarks.csproj", -+ "src\\Tools\\BuildValidator\\BuildValidator.csproj", -+ "src\\Tools\\BuildActionTelemetryTable\\BuildActionTelemetryTable.csproj", -+ "src\\CodeStyle\\Tools\\CodeStyleConfigFileGenerator.csproj", -+ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.shproj", -+ "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.Package.csproj", -+ "src\\Compilers\\Core\\Rebuild\\Microsoft.CodeAnalysis.Rebuild.csproj", -+ "src\\Tools\\ExternalAccess\\OmniSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj", -+ "src\\Tools\\ExternalAccess\\OmniSharp.CSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj", -+ "src\\Workspaces\\Remote\\ServiceHub.CoreComponents\\Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj" -+ ] -+ } -+} -\ No newline at end of file -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 92e316a4744..9905b35467e 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -11,7 +11,7 @@ - --> - - -- $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" -+ $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" - - - --- -2.31.1 - From b86d04b65d417d0ec63409746b955b33db51ec6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Feb 2022 08:22:22 -0800 Subject: [PATCH 05/40] Update dependencies from https://github.com/dotnet/arcade build 20220207.2 (#13186) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22102.3 -> To Version 6.0.0-beta.22107.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/source-build.yml | 15 +++++++++------ global.json | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dff25a08b..55cdcd357 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/arcade - 93e08e378eb00a4267ffeca24b6bebb4f6c011ef + fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 67023c50a..a509df55f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22102.3 + 6.0.0-beta.22107.2 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 5023d36dc..5cd5325d7 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,11 +31,6 @@ parameters: # container and pool. platform: {} - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - defaultContainerHostPool: - vmImage: ubuntu-20.04 - jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -47,7 +42,15 @@ jobs: container: ${{ parameters.platform.container }} ${{ if eq(parameters.platform.pool, '') }}: - pool: ${{ parameters.defaultContainerHostPool }} + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: NetCore1ESPool-Public + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/global.json b/global.json index 641ac3ef3..8d9bc761f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22102.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22102.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22107.2" } } From 583dcc4f28c3005d819e6d49533bcc7218476e5c Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 8 Feb 2022 13:14:46 -0800 Subject: [PATCH 06/40] [release/6.0.1xx] Windows SDK projection update --- eng/ManualVersions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 953d16ee6..08821b070 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,10 +9,10 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.22 - 10.0.18362.22 - 10.0.19041.22 - 10.0.20348.22 - 10.0.22000.22 + 10.0.17763.23 + 10.0.18362.23 + 10.0.19041.23 + 10.0.20348.23 + 10.0.22000.23 From ee9b80739fa3c1d29100e36fec9c8354b35a4e9b Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 8 Feb 2022 16:30:48 -0800 Subject: [PATCH 07/40] Update asp.net templates (#13193) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a509df55f..62525d731 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.13 + 5.0.14 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 From 2f89821757698ba317aaacf0e1b02e3affb4b81d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 19:00:35 +0000 Subject: [PATCH 08/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220210.1 (#13215) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index d896a1219..ce5a05af3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,19 +7,26 @@ - + + + + + + + + @@ -41,15 +48,22 @@ - + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54dfb6edd..c6e0514c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - a7c8487a49a4343bcbe279ea2f7406138cf98776 + 095aaf95c3d1d10a96db5cb3914632bc0c36db81 From d69361cbcf4dd501cf9fd5232e408f8aa4ed7ba3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 10 Feb 2022 15:58:01 -0600 Subject: [PATCH 09/40] Add test to compare msft and sb sdk contents (#13153) --- eng/source-build-tarball-build-official.yml | 2 +- eng/source-build-tarball-build.yml | 2 +- .../job/source-build-run-tarball-build.yml | 40 +- .../steps/source-build-build-tarball.yml | 45 +- .../BaselineHelper.cs | 31 + .../Config.cs | 6 +- .../DotNetHelper.cs | 21 +- .../ExecuteHelper.cs | 23 +- .../SdkContentTests.cs | 92 + .../XmlDocTests.cs | 7 +- .../baselines/MsftToSbSdk.diff | 1481 +++++++++++++++++ 11 files changed, 1699 insertions(+), 51 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 3f8f08321..a230a4d7c 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -11,4 +11,4 @@ stages: jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml parameters: - tarballResourceId: installer-build-resource + installerBuildResourceId: installer-build-resource diff --git a/eng/source-build-tarball-build.yml b/eng/source-build-tarball-build.yml index a800f5849..18dbe8324 100644 --- a/eng/source-build-tarball-build.yml +++ b/eng/source-build-tarball-build.yml @@ -11,4 +11,4 @@ stages: jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml parameters: - tarballResourceId: installer-build-resource + installerBuildResourceId: installer-build-resource diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 556f3fbe4..7a4f039c9 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -7,11 +7,12 @@ parameters: # Dependent jobs that must be completed before this job will run dependsOn: - # The resource id of the tarball to download and build - tarballResourceId: current + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: current # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- + buildJobTimeout: 300 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b @@ -42,12 +43,14 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} _ExcludeOmniSharpTests: true + _Platform: linux _RunOnline: true CentOS7-Offline: _BootstrapPrep: true _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} _ExcludeOmniSharpTests: true + _Platform: linux _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOS8-Offline: @@ -55,20 +58,23 @@ jobs: _BuildArch: x64 _Container: ${{ parameters.centOS8Container }} _ExcludeOmniSharpTests: false + _Platform: linux _RunOnline: false Fedora33-Offline: _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} _ExcludeOmniSharpTests: false + _Platform: linux _RunOnline: false Ubuntu1804-Offline: _BootstrapPrep: true _BuildArch: x64 _Container: ${{ parameters.ubuntu1804Container }} _ExcludeOmniSharpTests: false + _Platform: linux _RunOnline: false - timeoutInMinutes: 300 + timeoutInMinutes: ${{ parameters.buildJobTimeout }} variables: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - group: AzureDevOps-Artifact-Feeds-Pats @@ -79,20 +85,13 @@ jobs: - checkout: self clean: true - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - template: /src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml parameters: buildArch: $(_BuildArch) container: $(_Container) excludeOmniSharpTests: $(_ExcludeOmniSharpTests) + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + platform: $(_Platform) prepScript: | set -x @@ -104,7 +103,6 @@ jobs: docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball $(_Container) ./prep.sh ${customPrepArgs} runOnline: $(_RunOnline) tarballDir: ${{ parameters.tarballDir }} - tarballResourceId: ${{ parameters.tarballResourceId }} - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - job: Rebuild_Tarball @@ -121,8 +119,9 @@ jobs: _PreviousSourceBuildArtifact: Build Tarball Fedora33-Offline_Artifacts _BuildArch: x64 _Container: ${{ parameters.fedora33Container }} + _Platform: linux _RunOnline: false - timeoutInMinutes: 180 + timeoutInMinutes: ${{ parameters.buildJobTimeout }} variables: - ${{ if ne(variables['System.TeamProject'], 'public') }}: - group: AzureDevOps-Artifact-Feeds-Pats @@ -133,15 +132,6 @@ jobs: - checkout: self clean: true - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - arguments: $(Build.SourcesDirectory)/NuGet.config $Token - env: - Token: $(dn-bot-dnceng-artifact-feeds-rw) - - download: current artifact: $(_PreviousSourceBuildArtifact) patterns: '*.tar.gz' @@ -159,6 +149,9 @@ jobs: additionalBuildArgs: --with-sdk /tarball/.dotnet buildArch: $(_BuildArch) container: $(_Container) + installerBuildResourceId: ${{ parameters.installerBuildResourceId }} + isBootstrapped: true + platform: $(_Platform) prepScript: | set -x @@ -168,4 +161,3 @@ jobs: eval rm -f "$tarballFilePath" runOnline: $(_RunOnline) tarballDir: ${{ parameters.tarballDir }} - tarballResourceId: ${{ parameters.tarballResourceId }} diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index cfb965134..200a934b7 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -13,6 +13,15 @@ parameters: # Skip running the OmniSharp smoke-tests excludeOmniSharpTests: false + # Resource id of the installer build to retrieve source/product tarball's from + installerBuildResourceId: null + + # Whether or not this is a bootstrapped build + isBootstrapped: false + + # Platform the build is running on (linux, osx, win) + platform: null + # Script logic to prep the tarball for building prepScript: null @@ -22,21 +31,32 @@ parameters: # Directory to build the tarball in tarballDir: - # Resource id of the tarball to download and build - tarballResourceId: null - steps: - - download: ${{ parameters.tarballResourceId }} + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - download: ${{ parameters.installerBuildResourceId }} artifact: BlobArtifacts patterns: '**/dotnet-sdk-source*.tar.gz' - displayName: Download Tarball + displayName: Download Source Tarball + + - download: ${{ parameters.installerBuildResourceId }} + artifact: BlobArtifacts + patterns: '**/dotnet-sdk-!(*-*)-${{ parameters.platform }}-${{ parameters.buildArch }}.tar.gz' + displayName: Download MSFT sdk Tarball - script: | set -x resourceIdPathSegment= - if [ '${{ parameters.tarballResourceId }}' != 'current' ]; then - resourceIdPathSegment='${{ parameters.tarballResourceId }}/' + if [ '${{ parameters.installerBuildResourceId }}' != 'current' ]; then + resourceIdPathSegment='${{ parameters.installerBuildResourceId }}/' fi mkdir -p "${{ parameters.tarballDir }}" @@ -70,7 +90,16 @@ steps: rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config cp NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config - docker run --rm -v ${{ parameters.tarballDir }}:/tarball -w /tarball -e EXCLUDE_OMNISHARP_TESTS=${{ parameters.excludeOmniSharpTests}} ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} + dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" + dockerEnvArgs="-e EXCLUDE_OMNISHARP_TESTS=${{ parameters.excludeOmniSharpTests}}" + + if [ '${{ parameters.isBootstrapped}}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]; then + dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" + msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-${{ parameters.Platform }}-${{ parameters.buildArch }}.tar.gz" -exec basename {} \;) + dockerEnvArgs+=" -e MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + fi + + docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} displayName: Run Tests # Don't use CopyFiles@2 as it encounters permissions issues because it indexes all files in the source directory graph. diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs index 73c2951f7..3fc18b357 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs @@ -4,9 +4,11 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Linq; using Xunit; +using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests { @@ -32,6 +34,35 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests Assert.Null(message); } + public static void Compare(string baselineFileName, string actual, ITestOutputHelper outputHelper) + { + string baselineFilePath = GetBaselineFilePath(baselineFileName); + string baseline = File.ReadAllText(baselineFilePath); + + string? message = null; + if (baseline != actual) + { + string actualBaselineFilePath = Path.Combine(Environment.CurrentDirectory, $"{baselineFileName}"); + File.WriteAllText(actualBaselineFilePath, actual); + + // Retrieve a diff in order to provide a UX which calls out the diffs. + string diff = DiffFiles(baselineFilePath, actualBaselineFilePath, outputHelper); + message = $"{Environment.NewLine}Baseline '{baselineFilePath}' does not match actual '{actualBaselineFilePath}`. {Environment.NewLine}" + + $"{diff}{Environment.NewLine}"; + } + + Assert.Null(message); + } + + public static string DiffFiles(string file1Path, string file2Path, ITestOutputHelper outputHelper) + { + (Process Process, string StdOut, string StdErr) diffResult = + ExecuteHelper.ExecuteProcess("git", $"diff --no-index {file1Path} {file2Path}", outputHelper); + Assert.Equal(1, diffResult.Process.ExitCode); + + return diffResult.StdOut; + } + private static string GetBaselineFilePath(string baselineFileName) => Path.Combine(Directory.GetCurrentDirectory(), "baselines", baselineFileName); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index be0e6b411..11c3ed821 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -3,17 +3,21 @@ // See the LICENSE file in the project root for more information. using System; +using System.IO; namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal static class Config { - public static string DotNetDirectory { get; } = Environment.GetEnvironmentVariable("DOTNET_DIR") ?? "./.dotnet"; + public static string DotNetDirectory { get; } = + Environment.GetEnvironmentVariable("DOTNET_DIR") ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet"); public static string DotNetTarballPath { get; } = Environment.GetEnvironmentVariable(DotNetTarballPathEnv) ?? string.Empty; public const string DotNetTarballPathEnv = "DOTNET_TARBALL_PATH"; public static bool ExcludeOmniSharpTests { get; } = bool.TryParse(Environment.GetEnvironmentVariable("EXCLUDE_OMNISHARP_TESTS"), out bool excludeOmniSharpTests) ? excludeOmniSharpTests : false; public static bool ExcludeOnlineTests { get; } = bool.TryParse(Environment.GetEnvironmentVariable("EXCLUDE_ONLINE_TESTS"), out bool excludeOnlineTests) ? excludeOnlineTests : false; + public static string MsftSdkTarballPath { get; } = Environment.GetEnvironmentVariable(MsftSdkTarballPathEnv) ?? string.Empty; + public const string MsftSdkTarballPathEnv = "MSFT_SDK_TARBALL_PATH"; public static string TargetRid { get; } = Environment.GetEnvironmentVariable("TARGET_RID") ?? string.Empty; } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index 5a6716030..d3385c37e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -12,24 +12,27 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal class DotNetHelper { + private static readonly object s_lockObj = new object(); + public string DotNetPath { get; } - public string DotNetInstallDirectory { get; } public DotNetHelper(ITestOutputHelper outputHelper) { - if (!Directory.Exists(Config.DotNetDirectory)) + lock (s_lockObj) { - if (!File.Exists(Config.DotNetTarballPath)) + if (!Directory.Exists(Config.DotNetDirectory)) { - throw new InvalidOperationException($"Tarball path '{Config.DotNetTarballPath}' specified in {Config.DotNetTarballPathEnv} does not exist."); - } + if (!File.Exists(Config.DotNetTarballPath)) + { + throw new InvalidOperationException($"Tarball path '{Config.DotNetTarballPath}' specified in {Config.DotNetTarballPathEnv} does not exist."); + } - Directory.CreateDirectory(Config.DotNetDirectory); - ExecuteHelper.ExecuteProcess("tar", $"xzf {Config.DotNetTarballPath} -C {Config.DotNetDirectory}", outputHelper); + Directory.CreateDirectory(Config.DotNetDirectory); + ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.DotNetTarballPath} -C {Config.DotNetDirectory}", outputHelper); + } } - DotNetInstallDirectory = Path.Combine(Directory.GetCurrentDirectory(), Config.DotNetDirectory); - DotNetPath = Path.Combine(DotNetInstallDirectory, "dotnet"); + DotNetPath = Path.Combine(Config.DotNetDirectory, "dotnet"); } public void ExecuteDotNetCmd(string args, ITestOutputHelper outputHelper) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 2c38e43ca..497211ba1 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using System; using System.Diagnostics; using System.Linq; using System.Text; @@ -12,7 +13,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal static class ExecuteHelper { public static (Process Process, string StdOut, string StdErr) ExecuteProcess( - string fileName, string args, ITestOutputHelper outputHelper) + string fileName, string args, ITestOutputHelper outputHelper, bool logOutput = false) { outputHelper.WriteLine($"Executing: {fileName} {args}"); @@ -47,17 +48,33 @@ internal static class ExecuteHelper process.WaitForExit(); string output = stdOutput.ToString().Trim(); - if (outputHelper != null && !string.IsNullOrWhiteSpace(output)) + if (logOutput && !string.IsNullOrWhiteSpace(output)) { outputHelper.WriteLine(output); } string error = stdError.ToString().Trim(); - if (outputHelper != null && !string.IsNullOrWhiteSpace(error)) + if (logOutput && !string.IsNullOrWhiteSpace(error)) { outputHelper.WriteLine(error); } return (process, output, error); } + + public static string ExecuteProcessValidateExitCode(string fileName, string args, ITestOutputHelper outputHelper) + { + (Process Process, string StdOut, string StdErr) result = ExecuteHelper.ExecuteProcess(fileName, args, outputHelper); + + if (result.Process.ExitCode != 0) + { + ProcessStartInfo startInfo = result.Process.StartInfo; + string msg = $"Failed to execute {startInfo.FileName} {startInfo.Arguments}" + + $"{Environment.NewLine}Exit code: {result.Process.ExitCode}" + + $"{Environment.NewLine}Standard Error: {result.StdErr}"; + throw new InvalidOperationException(msg); + } + + return result.StdOut; + } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs new file mode 100644 index 000000000..774d76c33 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -0,0 +1,92 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text.RegularExpressions; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public class SdkContentTests +{ + private ITestOutputHelper OutputHelper { get; } + private DotNetHelper DotNetHelper { get; } + + public SdkContentTests(ITestOutputHelper outputHelper) + { + OutputHelper = outputHelper; + DotNetHelper = new DotNetHelper(outputHelper); + } + + /// + /// Verifies the file layout of the source built sdk tarball to the Microsoft build. + /// The differences are captured in baselines/MsftToSbSdkDiff.txt. + /// Version numbers that appear in paths are compared but are stripped from the baseline. + /// This makes the baseline durable between releases. This does mean however, entries + /// in the baseline may appear identical if the diff is version specific. + /// + [Fact] + public void CompareMsftToSb() + { + if (string.IsNullOrWhiteSpace(Config.MsftSdkTarballPath)) + { + OutputHelper.WriteLine($"skipping {nameof(CompareMsftToSb)} because {Config.MsftSdkTarballPathEnv} was not specified."); + return; + } + + if (!File.Exists(Config.MsftSdkTarballPath)) + { + throw new InvalidOperationException($"Tarball path '{Config.MsftSdkTarballPath}' specified in {Config.MsftSdkTarballPathEnv} does not exist."); + } + + const string msftFileListingFileName = "msftSdkFiles.txt"; + const string sbFileListingFileName = "sbSdkFiles.txt"; + WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName); + WriteTarballFileList(Config.DotNetTarballPath, sbFileListingFileName); + + string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); + diff = RemoveVersionedPaths(diff); + diff = RemoveDiffMarkers(diff); + diff = RemoveRids(diff); + BaselineHelper.Compare("MsftToSbSdk.diff", diff, OutputHelper); + } + + private void WriteTarballFileList(string tarballPath, string outputFileName) + { + string fileListing = ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"tf {tarballPath}", OutputHelper); + IEnumerable files = fileListing.Split(Environment.NewLine).OrderBy(path => path); + File.WriteAllLines(outputFileName, files); + } + + private static string RemoveDiffMarkers(string source) + { + Regex indexRegex = new("^index .*", RegexOptions.Multiline); + string result = indexRegex.Replace(source, "index ------------"); + + Regex diffSegmentRegex = new("^@@ .* @@", RegexOptions.Multiline); + return diffSegmentRegex.Replace(result, "@@ ------------ @@"); + } + + private string RemoveRids(string diff) => diff.Replace(Config.TargetRid, "bannana.rid"); + + private static string RemoveVersionedPaths(string source) + { + // Remove semantic version path segments + string pathSeparator = Regex.Escape(Path.DirectorySeparatorChar.ToString()); + // Regex source: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string + Regex semanticVersionRegex = new( + $"{pathSeparator}(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)" + + $"(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))" + + $"?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?{pathSeparator}"); + string result = semanticVersionRegex.Replace(source, $"{Path.DirectorySeparatorChar}x.y.z{Path.DirectorySeparatorChar}"); + + // Remove net.x.y path segments + Regex netTfmRegex = new($"{pathSeparator}net[1-9]*.[0-9]{pathSeparator}"); + return netTfmRegex.Replace(result, $"{Path.DirectorySeparatorChar}netx.y{Path.DirectorySeparatorChar}"); + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs index dd4cadf70..01168ef4e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.IO; using Xunit; using Xunit.Abstractions; -using System; using System.Linq; namespace Microsoft.DotNet.SourceBuild.SmokeTests; @@ -31,7 +30,7 @@ public class XmlDocTests { List missingXmlDoc = new(); - string targetingPacksDirectory = Path.Combine(DotNetHelper.DotNetInstallDirectory, "packs"); + string targetingPacksDirectory = Path.Combine(Config.DotNetDirectory, "packs"); foreach (string targetingPackAssembly in Directory.EnumerateFiles(targetingPacksDirectory, "*.dll", SearchOption.AllDirectories)) { if (targetingPackAssembly.EndsWith("resources.dll")) @@ -42,8 +41,8 @@ public class XmlDocTests string xmlFile = Path.ChangeExtension(targetingPackAssembly, ".xml"); if (!File.Exists(xmlFile)) { - string pathWithoutPacksPrefix = xmlFile.Substring(targetingPacksDirectory.Length + 1); - String[] pathParts = pathWithoutPacksPrefix.Split(Path.DirectorySeparatorChar); + string pathWithoutPacksPrefix = xmlFile[(targetingPacksDirectory.Length + 1)..]; + string[] pathParts = pathWithoutPacksPrefix.Split(Path.DirectorySeparatorChar); string pathWithoutVersion = string.Join(Path.DirectorySeparatorChar, pathParts.Take(1).Concat(pathParts.Skip(2))); missingXmlDoc.Add(pathWithoutVersion); } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff new file mode 100644 index 000000000..0a153ba87 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff @@ -0,0 +1,1481 @@ +diff --git a/msftSdkFiles.txt b/sbSdkFiles.txt +index ------------ +--- a/msftSdkFiles.txt ++++ b/sbSdkFiles.txt +@@ ------------ @@ + ./host/fxr/x.y.z/ + ./host/fxr/x.y.z/libhostfxr.so + ./LICENSE.txt ++./metadata/ ++./metadata/workloads/ ++./metadata/workloads/x.y.z/ ++./metadata/workloads/x.y.z/userlocal + ./packs/ + ./packs/Microsoft.AspNetCore.App.Ref/ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ +@@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml +-./packs/Microsoft.NETCore.App.Host.linux-x64/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/ +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/apphost +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/coreclr_delegates.h +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/hostfxr.h +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.a +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.so +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/nethost.h +-./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml ++./packs/Microsoft.NETCore.App.Host.bannana.rid/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/ ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/apphost ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/coreclr_delegates.h ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/hostfxr.h ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.a ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.so ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/nethost.h ++./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/singlefilehost + ./packs/Microsoft.NETCore.App.Ref/ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/ + ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ +@@ ------------ @@ + ./sdk/x.y.z/AppHostTemplate/apphost + ./sdk/x.y.z/cs/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/cs/Microsoft.VisualStudio.Coverage.IO.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.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/cs/NuGet.Credentials.resources.dll +-./sdk/x.y.z/cs/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/cs/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/cs/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/cs/NuGet.Localization.resources.dll +-./sdk/x.y.z/cs/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/cs/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/cs/NuGet.Packaging.resources.dll +-./sdk/x.y.z/cs/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/cs/NuGet.Protocol.resources.dll +-./sdk/x.y.z/cs/NuGet.Resolver.resources.dll +-./sdk/x.y.z/cs/NuGet.Versioning.resources.dll +-./sdk/x.y.z/cs/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/cs/System.CommandLine.resources.dll +-./sdk/x.y.z/cs/vstest.console.resources.dll + ./sdk/x.y.z/Current/ + ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ + ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ +@@ ------------ @@ + ./sdk/x.y.z/datacollector.runtimeconfig.json + ./sdk/x.y.z/de/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/de/Microsoft.VisualStudio.Coverage.IO.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.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/de/NuGet.Credentials.resources.dll +-./sdk/x.y.z/de/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/de/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/de/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/de/NuGet.Localization.resources.dll +-./sdk/x.y.z/de/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/de/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/de/NuGet.Packaging.resources.dll +-./sdk/x.y.z/de/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/de/NuGet.Protocol.resources.dll +-./sdk/x.y.z/de/NuGet.Resolver.resources.dll +-./sdk/x.y.z/de/NuGet.Versioning.resources.dll +-./sdk/x.y.z/de/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/de/System.CommandLine.resources.dll +-./sdk/x.y.z/de/vstest.console.resources.dll + ./sdk/x.y.z/dotnet-watch.deps.json + ./sdk/x.y.z/dotnet-watch.runtimeconfig.json + ./sdk/x.y.z/dotnet.deps.json +@@ ------------ @@ + ./sdk/x.y.z/dotnet.runtimeconfig.json + ./sdk/x.y.z/DotnetTools/ + ./sdk/x.y.z/DotnetTools/dotnet-dev-certs/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json +-./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json ++./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml + ./sdk/x.y.z/DotnetTools/dotnet-format/ + ./sdk/x.y.z/DotnetTools/dotnet-format/cs/ + ./sdk/x.y.z/DotnetTools/dotnet-format/cs/dotnet-format.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/System.CommandLine.resources.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Collections.Immutable.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.Rendering.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.AttributedModel.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Hosting.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Runtime.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.TypedParts.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Diagnostics.DiagnosticSource.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/System.IO.Pipelines.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ + ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/System.CommandLine.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll +-./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Hosting.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Runtime.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.TypedParts.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotNetWatch.targets + ./sdk/x.y.z/es/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/es/Microsoft.VisualStudio.Coverage.IO.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.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/es/NuGet.Credentials.resources.dll +-./sdk/x.y.z/es/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/es/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/es/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/es/NuGet.Localization.resources.dll +-./sdk/x.y.z/es/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/es/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/es/NuGet.Packaging.resources.dll +-./sdk/x.y.z/es/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/es/NuGet.Protocol.resources.dll +-./sdk/x.y.z/es/NuGet.Resolver.resources.dll +-./sdk/x.y.z/es/NuGet.Versioning.resources.dll +-./sdk/x.y.z/es/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/es/System.CommandLine.resources.dll +-./sdk/x.y.z/es/vstest.console.resources.dll + ./sdk/x.y.z/Extensions/ +-./sdk/x.y.z/Extensions/cs/ +-./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/de/ +-./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/es/ +-./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/fr/ +-./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/it/ +-./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ja/ +-./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ko/ +-./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll + ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll + ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll + ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.TestHostRuntimeProvider.dll + ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll + ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll +-./sdk/x.y.z/Extensions/pl/ +-./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/ +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ru/ +-./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/tr/ +-./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/ +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/ +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll +-./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll +-./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/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/fr/Microsoft.VisualStudio.Coverage.IO.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.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/fr/NuGet.Credentials.resources.dll +-./sdk/x.y.z/fr/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/fr/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/fr/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/fr/NuGet.Localization.resources.dll +-./sdk/x.y.z/fr/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/fr/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/fr/NuGet.Packaging.resources.dll +-./sdk/x.y.z/fr/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/fr/NuGet.Protocol.resources.dll +-./sdk/x.y.z/fr/NuGet.Resolver.resources.dll +-./sdk/x.y.z/fr/NuGet.Versioning.resources.dll +-./sdk/x.y.z/fr/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/fr/System.CommandLine.resources.dll +-./sdk/x.y.z/fr/vstest.console.resources.dll + ./sdk/x.y.z/FSharp/ + ./sdk/x.y.z/FSharp/cs/ + ./sdk/x.y.z/FSharp/cs/FSharp.Build.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/FSharp/Microsoft.FSharp.Targets + ./sdk/x.y.z/FSharp/Microsoft.NET.StringTools.dll + ./sdk/x.y.z/FSharp/Microsoft.Portable.FSharp.Targets +-./sdk/x.y.z/FSharp/Microsoft.Win32.SystemEvents.dll + ./sdk/x.y.z/FSharp/pl/ + ./sdk/x.y.z/FSharp/pl/FSharp.Build.resources.dll + ./sdk/x.y.z/FSharp/pl/FSharp.Compiler.Interactive.Settings.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/FSharp/ru/FSharp.Compiler.Service.resources.dll + ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll + ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll +-./sdk/x.y.z/FSharp/runtimes/ +-./sdk/x.y.z/FSharp/runtimes/unix/ +-./sdk/x.y.z/FSharp/runtimes/unix/lib/ +-./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/ +-./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll +-./sdk/x.y.z/FSharp/runtimes/win/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/ +-./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/FSharp/System.CodeDom.dll +-./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +-./sdk/x.y.z/FSharp/System.Drawing.Common.dll + ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll +-./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll +-./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll +-./sdk/x.y.z/FSharp/System.Security.Permissions.dll +-./sdk/x.y.z/FSharp/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/tr/ + ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll + ./sdk/x.y.z/FSharp/tr/FSharp.Compiler.Interactive.Settings.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/IncludedWorkloadManifests.txt + ./sdk/x.y.z/it/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/it/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll +-./sdk/x.y.z/it/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/it/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/it/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/it/NuGet.Localization.resources.dll +-./sdk/x.y.z/it/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/it/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/it/NuGet.Packaging.resources.dll +-./sdk/x.y.z/it/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/it/NuGet.Protocol.resources.dll +-./sdk/x.y.z/it/NuGet.Resolver.resources.dll +-./sdk/x.y.z/it/NuGet.Versioning.resources.dll +-./sdk/x.y.z/it/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/it/System.CommandLine.resources.dll +-./sdk/x.y.z/it/vstest.console.resources.dll + ./sdk/x.y.z/ja/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/ja/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll +-./sdk/x.y.z/ja/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/ja/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/ja/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/ja/NuGet.Localization.resources.dll +-./sdk/x.y.z/ja/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/ja/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/ja/NuGet.Packaging.resources.dll +-./sdk/x.y.z/ja/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/ja/NuGet.Protocol.resources.dll +-./sdk/x.y.z/ja/NuGet.Resolver.resources.dll +-./sdk/x.y.z/ja/NuGet.Versioning.resources.dll +-./sdk/x.y.z/ja/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/ja/System.CommandLine.resources.dll +-./sdk/x.y.z/ja/vstest.console.resources.dll + ./sdk/x.y.z/ko/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/ko/Microsoft.VisualStudio.Coverage.IO.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.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/ko/NuGet.Credentials.resources.dll +-./sdk/x.y.z/ko/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/ko/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/ko/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/ko/NuGet.Localization.resources.dll +-./sdk/x.y.z/ko/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/ko/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/ko/NuGet.Packaging.resources.dll +-./sdk/x.y.z/ko/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/ko/NuGet.Protocol.resources.dll +-./sdk/x.y.z/ko/NuGet.Resolver.resources.dll +-./sdk/x.y.z/ko/NuGet.Versioning.resources.dll +-./sdk/x.y.z/ko/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/ko/System.CommandLine.resources.dll +-./sdk/x.y.z/ko/vstest.console.resources.dll + ./sdk/x.y.z/Microsoft.ApplicationInsights.dll + ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll + ./sdk/x.y.z/Microsoft.Build.dll +@@ ------------ @@ + ./sdk/x.y.z/Microsoft.DotNet.NativeWrapper.dll + ./sdk/x.y.z/Microsoft.DotNet.SdkResolver.dll + ./sdk/x.y.z/Microsoft.DotNet.TemplateLocator.dll +-./sdk/x.y.z/Microsoft.Extensions.CommandLineUtils.dll + ./sdk/x.y.z/Microsoft.Extensions.Configuration.Abstractions.dll + ./sdk/x.y.z/Microsoft.Extensions.Configuration.Binder.dll + ./sdk/x.y.z/Microsoft.Extensions.Configuration.dll +@@ ------------ @@ + ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.deps.json + ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.dll + ./sdk/x.y.z/Microsoft.TestPlatform.targets ++./sdk/x.y.z/Microsoft.TestPlatform.TestHostRuntimeProvider.dll + ./sdk/x.y.z/Microsoft.TestPlatform.Utilities.dll + ./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll +-./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml + ./sdk/x.y.z/Microsoft.VisualBasic.CrossTargeting.targets + ./sdk/x.y.z/Microsoft.VisualBasic.CurrentVersion.targets + ./sdk/x.y.z/Microsoft.VisualBasic.targets +-./sdk/x.y.z/Microsoft.VisualStudio.Coverage.IO.dll + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Client.dll + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Common.dll ++./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll ++./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.deps.json + ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + ./sdk/x.y.z/Microsoft.VisualStudioVersion.v11.Common.props + ./sdk/x.y.z/Microsoft.VisualStudioVersion.v12.Common.props + ./sdk/x.y.z/Microsoft.VisualStudioVersion.v14.Common.props + ./sdk/x.y.z/Microsoft.Win32.Msi.dll +-./sdk/x.y.z/Microsoft.Win32.SystemEvents.dll + ./sdk/x.y.z/Microsoft/ + ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/ + ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.ConflictResolution.targets +@@ ------------ @@ + ./sdk/x.y.z/package.deps.json + ./sdk/x.y.z/pl/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/pl/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll +-./sdk/x.y.z/pl/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/pl/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/pl/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/pl/NuGet.Localization.resources.dll +-./sdk/x.y.z/pl/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/pl/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/pl/NuGet.Packaging.resources.dll +-./sdk/x.y.z/pl/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/pl/NuGet.Protocol.resources.dll +-./sdk/x.y.z/pl/NuGet.Resolver.resources.dll +-./sdk/x.y.z/pl/NuGet.Versioning.resources.dll +-./sdk/x.y.z/pl/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/pl/System.CommandLine.resources.dll +-./sdk/x.y.z/pl/vstest.console.resources.dll + ./sdk/x.y.z/pt-BR/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.Coverage.IO.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.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/pt-BR/NuGet.Credentials.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Localization.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Packaging.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Protocol.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Resolver.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.Versioning.resources.dll +-./sdk/x.y.z/pt-BR/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll +-./sdk/x.y.z/pt-BR/vstest.console.resources.dll + ./sdk/x.y.z/ref/ ++./sdk/x.y.z/ref/Microsoft.TestPlatform.PlatformAbstractions.dll ++./sdk/x.y.z/ref/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + ./sdk/x.y.z/ref/MSBuild.dll + ./sdk/x.y.z/ref/mscorlib.dll + ./sdk/x.y.z/ref/netstandard.dll +@@ ------------ @@ + ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll + ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll + ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll ++./sdk/x.y.z/Roslyn/bincore/runtimes/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/ ++./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll + ./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll + ./sdk/x.y.z/Roslyn/bincore/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Roslyn/bincore/tr/ + ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll + ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll + ./sdk/x.y.z/ru/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/ru/Microsoft.VisualStudio.Coverage.IO.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.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/ru/NuGet.Credentials.resources.dll +-./sdk/x.y.z/ru/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/ru/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/ru/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/ru/NuGet.Localization.resources.dll +-./sdk/x.y.z/ru/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/ru/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/ru/NuGet.Packaging.resources.dll +-./sdk/x.y.z/ru/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/ru/NuGet.Protocol.resources.dll +-./sdk/x.y.z/ru/NuGet.Resolver.resources.dll +-./sdk/x.y.z/ru/NuGet.Versioning.resources.dll +-./sdk/x.y.z/ru/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/ru/System.CommandLine.resources.dll +-./sdk/x.y.z/ru/vstest.console.resources.dll + ./sdk/x.y.z/RuntimeIdentifierGraph.json + ./sdk/x.y.z/runtimes/ + ./sdk/x.y.z/runtimes/any/ +@@ ------------ @@ + ./sdk/x.y.z/runtimes/any/native/NuGet.props + ./sdk/x.y.z/runtimes/any/native/NuGet.RestoreEx.targets + ./sdk/x.y.z/runtimes/any/native/NuGet.targets +-./sdk/x.y.z/runtimes/unix/ +-./sdk/x.y.z/runtimes/unix/lib/ +-./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/ +-./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll ++./sdk/x.y.z/runtimes/browser/ ++./sdk/x.y.z/runtimes/browser/lib/ ++./sdk/x.y.z/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/runtimes/win/ + ./sdk/x.y.z/runtimes/win/lib/ + ./sdk/x.y.z/runtimes/win/lib/netx.y/ + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll +-./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll +-./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ +-./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache + ./sdk/x.y.z/SdkResolvers/ + ./sdk/x.y.z/SdkResolvers/Microsoft.Build.NuGetSdkResolver/ +@@ ------------ @@ + ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.props + ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.targets + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/ ++./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/microsoft.docker.sdk.1.1.0.csproj + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.props + ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.targets +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Buffers.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Collections.Immutable.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Reflection.Metadata.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/ +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentNoLocation.transform + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/de/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/de/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Bcl.AsyncInterfaces.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll.config +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Delegation.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.Tracing.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.XmlTransform.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Buffers.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Numerics.Vectors.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Encodings.Web.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Json.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Threading.Tasks.Extensions.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.ValueTuple.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/Microsoft.NET.Sdk.Publish.Tasks.resources.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Buffers.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Collections.Immutable.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Reflection.Metadata.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Runtime.CompilerServices.Unsafe.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props +@@ ------------ @@ + ./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.Web/tools/netx.y/ref/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/Microsoft.NET.Sdk.Web.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Icon.png +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.WinFX.targets +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/System.Windows.Forms.Analyzers.props +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/THIRD-PARTY-NOTICES.TXT +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Collections.Immutable.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Numerics.Vectors.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.Metadata.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/useSharedDesignerContext.txt +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/version.txt + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/Sdk.props +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Buffers.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Collections.Immutable.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Memory.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Numerics.Vectors.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Reflection.Metadata.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/ + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/NuGet.Build.Tasks.Pack.resources.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Build.Tasks.Pack.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Commands.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Common.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Configuration.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Credentials.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.DependencyResolver.Core.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Frameworks.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.LibraryModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Packaging.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.ProjectModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Protocol.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Versioning.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/NuGet.Build.Tasks.Pack.resources.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/ +-./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Commands.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Common.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Configuration.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Credentials.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.DependencyResolver.Core.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Frameworks.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.LibraryModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Packaging.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.ProjectModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Protocol.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Versioning.dll + ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/icon.png ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Commands.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Common.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Configuration.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Credentials.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.DependencyResolver.Core.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Frameworks.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.LibraryModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Packaging.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.ProjectModel.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Protocol.dll ++./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Versioning.dll + ./sdk/x.y.z/System.CodeDom.dll + ./sdk/x.y.z/System.CommandLine.dll +-./sdk/x.y.z/System.Configuration.ConfigurationManager.dll ++./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll + ./sdk/x.y.z/System.Diagnostics.EventLog.dll +-./sdk/x.y.z/System.Drawing.Common.dll + ./sdk/x.y.z/System.Resources.Extensions.dll +-./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll ++./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/System.Security.Cryptography.Xml.dll +-./sdk/x.y.z/System.Security.Permissions.dll + ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll +-./sdk/x.y.z/System.Windows.Extensions.dll ++./sdk/x.y.z/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/System.Text.Encodings.Web.dll ++./sdk/x.y.z/System.Text.Json.dll ++./sdk/x.y.z/testhost.deps.json ++./sdk/x.y.z/testhost.dll ++./sdk/x.y.z/testhost.dll.config ++./sdk/x.y.z/testhost.runtimeconfig.json ++./sdk/x.y.z/testhost.x86 ++./sdk/x.y.z/testhost.x86.deps.json ++./sdk/x.y.z/testhost.x86.dll ++./sdk/x.y.z/testhost.x86.dll.config ++./sdk/x.y.z/testhost.x86.runtimeconfig.json + ./sdk/x.y.z/TestHost/ +-./sdk/x.y.z/TestHost/cs/ +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/datacollector.exe +-./sdk/x.y.z/TestHost/datacollector.exe.config +-./sdk/x.y.z/TestHost/de/ +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/es/ +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/fr/ +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/it/ +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/ja/ +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/ko/ +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll +@@ ------------ @@ + ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.Utilities.dll + ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.Common.dll + ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll +-./sdk/x.y.z/TestHost/msdia140typelib_clr0200.dll + ./sdk/x.y.z/TestHost/Newtonsoft.Json.dll + ./sdk/x.y.z/TestHost/NuGet.Frameworks.dll +-./sdk/x.y.z/TestHost/pl/ +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/ +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/ru/ +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/System.Collections.Immutable.dll +-./sdk/x.y.z/TestHost/System.Reflection.Metadata.dll +-./sdk/x.y.z/TestHost/testhost.exe +-./sdk/x.y.z/TestHost/testhost.exe.config +-./sdk/x.y.z/TestHost/testhost.net452.exe +-./sdk/x.y.z/TestHost/testhost.net452.exe.config +-./sdk/x.y.z/TestHost/testhost.net452.x86.exe +-./sdk/x.y.z/TestHost/testhost.net452.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net46.exe +-./sdk/x.y.z/TestHost/testhost.net46.exe.config +-./sdk/x.y.z/TestHost/testhost.net46.x86.exe +-./sdk/x.y.z/TestHost/testhost.net46.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net461.exe +-./sdk/x.y.z/TestHost/testhost.net461.exe.config +-./sdk/x.y.z/TestHost/testhost.net461.x86.exe +-./sdk/x.y.z/TestHost/testhost.net461.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net462.exe +-./sdk/x.y.z/TestHost/testhost.net462.exe.config +-./sdk/x.y.z/TestHost/testhost.net462.x86.exe +-./sdk/x.y.z/TestHost/testhost.net462.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net47.exe +-./sdk/x.y.z/TestHost/testhost.net47.exe.config +-./sdk/x.y.z/TestHost/testhost.net47.x86.exe +-./sdk/x.y.z/TestHost/testhost.net47.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net471.exe +-./sdk/x.y.z/TestHost/testhost.net471.exe.config +-./sdk/x.y.z/TestHost/testhost.net471.x86.exe +-./sdk/x.y.z/TestHost/testhost.net471.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net472.exe +-./sdk/x.y.z/TestHost/testhost.net472.exe.config +-./sdk/x.y.z/TestHost/testhost.net472.x86.exe +-./sdk/x.y.z/TestHost/testhost.net472.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.net48.exe +-./sdk/x.y.z/TestHost/testhost.net48.exe.config +-./sdk/x.y.z/TestHost/testhost.net48.x86.exe +-./sdk/x.y.z/TestHost/testhost.net48.x86.exe.config +-./sdk/x.y.z/TestHost/testhost.x86.exe +-./sdk/x.y.z/TestHost/testhost.x86.exe.config +-./sdk/x.y.z/TestHost/tr/ +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/x64/ +-./sdk/x.y.z/TestHost/x64/msdia140.dll +-./sdk/x.y.z/TestHost/x64/msdia140.dll.manifest +-./sdk/x.y.z/TestHost/x86/ +-./sdk/x.y.z/TestHost/x86/msdia140.dll +-./sdk/x.y.z/TestHost/x86/msdia140.dll.manifest +-./sdk/x.y.z/TestHost/zh-Hans/ +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/ +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll +-./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll ++./sdk/x.y.z/TestHost/ref/ ++./sdk/x.y.z/TestHost/ref/testhost.dll ++./sdk/x.y.z/TestHost/ref/testhost.x86.dll ++./sdk/x.y.z/TestHost/testhost.deps.json ++./sdk/x.y.z/TestHost/testhost.dll ++./sdk/x.y.z/TestHost/testhost.dll.config ++./sdk/x.y.z/TestHost/testhost.runtimeconfig.json ++./sdk/x.y.z/TestHost/testhost.x86 ++./sdk/x.y.z/TestHost/testhost.x86.deps.json ++./sdk/x.y.z/TestHost/testhost.x86.dll ++./sdk/x.y.z/TestHost/testhost.x86.dll.config ++./sdk/x.y.z/TestHost/testhost.x86.runtimeconfig.json + ./sdk/x.y.z/tr/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/tr/Microsoft.VisualStudio.Coverage.IO.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.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/tr/NuGet.Credentials.resources.dll +-./sdk/x.y.z/tr/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/tr/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/tr/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/tr/NuGet.Localization.resources.dll +-./sdk/x.y.z/tr/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/tr/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/tr/NuGet.Packaging.resources.dll +-./sdk/x.y.z/tr/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/tr/NuGet.Protocol.resources.dll +-./sdk/x.y.z/tr/NuGet.Resolver.resources.dll +-./sdk/x.y.z/tr/NuGet.Versioning.resources.dll +-./sdk/x.y.z/tr/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/tr/System.CommandLine.resources.dll +-./sdk/x.y.z/tr/vstest.console.resources.dll ++./sdk/x.y.z/vstest.console + ./sdk/x.y.z/vstest.console.deps.json + ./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/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Localization.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Packaging.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Protocol.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Resolver.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.Versioning.resources.dll +-./sdk/x.y.z/zh-Hans/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll +-./sdk/x.y.z/zh-Hans/vstest.console.resources.dll + ./sdk/x.y.z/zh-Hant/ + ./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.TemplateEngine.Edge.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll +-./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.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.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/zh-Hant/NuGet.Credentials.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.DependencyResolver.Core.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Frameworks.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.LibraryModel.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Localization.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.PackageManagement.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Packaging.Core.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Packaging.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.ProjectModel.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Protocol.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Resolver.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.Versioning.resources.dll +-./sdk/x.y.z/zh-Hant/NuGet.VisualStudio.Contracts.resources.dll + ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll +-./sdk/x.y.z/zh-Hant/vstest.console.resources.dll + ./shared/ + ./shared/Microsoft.AspNetCore.App/ + ./shared/Microsoft.AspNetCore.App/x.y.z/ +@@ ------------ @@ + ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Extensions.WebEncoders.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.JSInterop.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Net.Http.Headers.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.DiagnosticSource.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.EventLog.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Formats.Asn1.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.IO.Pipelines.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Runtime.CompilerServices.Unsafe.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.AccessControl.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Pkcs.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Xml.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Encodings.Web.dll ++./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Json.dll + ./shared/Microsoft.AspNetCore.App/x.y.z/THIRD-PARTY-NOTICES.txt + ./shared/Microsoft.NETCore.App/ + ./shared/Microsoft.NETCore.App/x.y.z/ \ No newline at end of file From 606bca49cbd7b57539b8c2f271cffe4a3c5b7048 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Mon, 14 Feb 2022 21:12:25 -0600 Subject: [PATCH 10/40] Update to SDK and previously-source-built 6.0.102. (#13221) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 13a07e1ed..72fdc7630 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.1-1 + 6.0.2 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index ce1b32a1d..c0ffde810 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.101" + "dotnet": "6.0.102" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 35abe3c7cfcacc37465644dd4a78e5f84ec8a4f2 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 15 Feb 2022 18:35:05 -0500 Subject: [PATCH 11/40] Add CentOS Stream 9 container to CI matrix (#12955) --- .../templates/job/source-build-run-tarball-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 7a4f039c9..4477de593 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -15,6 +15,7 @@ parameters: buildJobTimeout: 300 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b @@ -60,6 +61,13 @@ jobs: _ExcludeOmniSharpTests: false _Platform: linux _RunOnline: false + CentOSStream9-Offline: + _BootstrapPrep: true + _BuildArch: x64 + _Container: ${{ parameters.centOSStream9Container }} + _ExcludeOmniSharpTests: false + _Platform: linux + _RunOnline: false Fedora33-Offline: _BootstrapPrep: false _BuildArch: x64 From e63e925b571a653613629ca719174224c3bd1df4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Feb 2022 00:07:45 +0000 Subject: [PATCH 12/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220215.1 (#13229) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- NuGet.config | 22 ---------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce5a05af3..9ee0fa704 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,21 +13,10 @@ - - - - - - - - - - - @@ -50,20 +39,9 @@ - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6e0514c7..f48fcebc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 095aaf95c3d1d10a96db5cb3914632bc0c36db81 + d933cf368424482afb2bd8aebe6a412932f4fee4 From f6763d6f6dec8374986acc3a632cbf81fb6e9891 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 16 Feb 2022 15:56:19 -0600 Subject: [PATCH 13/40] Gather additional smoke test prereqs (#13233) --- src/SourceBuild/tarball/content/build.proj | 20 ++++++++++++++++--- .../smoke-tests/smoke-test.sh | 4 ++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 9c59468f6..f2bdcbe28 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -106,9 +106,23 @@ " /> - + Condition="'$(SkipSmokeTestPrereqsTarballCreation)' != 'true'" + DependsOnTargets=" + CheckIfCreateSmokeTestPrereqsExistToPack; + CreateCreateSmokeTestPrereqsTarballIfPrereqsExist"/> + + + + + + + + + + $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz @@ -116,7 +130,7 @@ - + diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh index 1762122d8..e7edfed15 100755 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh @@ -251,12 +251,14 @@ function doCommand() { "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true } else runPublishScenarios() { "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" + "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true } fi if [ "$projectOutput" == "true" ]; then @@ -351,6 +353,8 @@ function runWebTests() { doCommand C# razor "$@" new restore build run multi-rid-publish doCommand C# blazorwasm "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish + doCommand C# worker new restore + doCommand C# angular new restore doCommand F# web "$@" new restore build run multi-rid-publish doCommand F# mvc "$@" new restore build run multi-rid-publish From cab7e65d17d81a78184034a1da3e41277e8573d5 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 16 Feb 2022 19:05:17 -0600 Subject: [PATCH 14/40] Remove bootstrapping for CI builds now that we use CentOS7 previously-source-built (#13232) --- .../templates/job/source-build-run-tarball-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 4477de593..a0db3872f 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -40,14 +40,14 @@ jobs: strategy: matrix: CentOS7-Online: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} _ExcludeOmniSharpTests: true _Platform: linux _RunOnline: true CentOS7-Offline: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS7Container }} _ExcludeOmniSharpTests: true @@ -55,14 +55,14 @@ jobs: _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOS8-Offline: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOS8Container }} _ExcludeOmniSharpTests: false _Platform: linux _RunOnline: false CentOSStream9-Offline: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.centOSStream9Container }} _ExcludeOmniSharpTests: false @@ -76,7 +76,7 @@ jobs: _Platform: linux _RunOnline: false Ubuntu1804-Offline: - _BootstrapPrep: true + _BootstrapPrep: false _BuildArch: x64 _Container: ${{ parameters.ubuntu1804Container }} _ExcludeOmniSharpTests: false From 102421b21d5260bbd7477a4d1fe0cdc4617e0927 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Feb 2022 16:32:24 +0000 Subject: [PATCH 15/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f48fcebc2..c8822ecf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - d933cf368424482afb2bd8aebe6a412932f4fee4 + ed58779fdb436582d28af4a356180090d11e1159 From 73fd7ac6017d9b6de2016095f246a0f1f10f06c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Feb 2022 02:57:43 +0000 Subject: [PATCH 16/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220217.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22115.1 -> To Version 6.0.0-servicing.22117.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8822ecf3..577376c1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - ed58779fdb436582d28af4a356180090d11e1159 + 58acc1f97a4c7b121356ea9b33b7db29b861b81d From 215108835e503905d95c5a146abfa34bda601924 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 18 Feb 2022 06:51:43 -0800 Subject: [PATCH 17/40] [release/6.0.1xx] Add source-build tests for dotnet format (#13207) * add dotnet format tests * some updates from code review * move helper methods out of DotNetFormatTests class * rearrange smoke test assets * update various smoke-test paths and remove root repo check from legacy smoke test script * fix smoke-test-prereqs tar command path * fix naming conventions and remove extra formatting test * more refactoring from pr comments * refactor BaselineHelper comparison methods * simplify comparison methods * clarify FormatTest expected result naming * remove unnecessary empty props and targets files --- src/SourceBuild/tarball/content/build.proj | 6 +-- .../BaselineHelper.cs | 30 ++++++++---- .../DotNetFormatTests.cs | 47 +++++++++++++++++++ .../DotNetHelper.cs | 15 +++++- ...osoft.DotNet.SourceBuild.SmokeTests.csproj | 13 +++-- .../SdkContentTests.cs | 2 +- .../SmokeTests.cs | 2 +- .../XmlDocTests.cs | 2 +- .../assets/FormatTestExpectedFormatted.cs | 11 +++++ .../assets/FormatTestUnformatted.cs | 11 +++++ .../{ => assets}/baselines/MissingXmlDoc.txt | 0 .../{ => assets}/baselines/MsftToSbSdk.diff | 0 .../smoke-tests/local.NuGet.Config | 0 .../smoke-tests/online.NuGet.Config | 0 .../{ => assets}/smoke-tests/smoke-test.sh | 8 +--- 15 files changed, 116 insertions(+), 31 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestExpectedFormatted.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/{ => assets}/baselines/MissingXmlDoc.txt (100%) rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/{ => assets}/baselines/MsftToSbSdk.diff (100%) rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/{ => assets}/smoke-tests/local.NuGet.Config (100%) rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/{ => assets}/smoke-tests/online.NuGet.Config (100%) rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/{ => assets}/smoke-tests/smoke-test.sh (98%) diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index f2bdcbe28..83b0ae6c8 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -21,10 +21,6 @@ - - - - @@ -128,7 +124,7 @@ + WorkingDirectory="./test/Microsoft.DotNet.SourceBuild.SmokeTests/bin/$(Configuration)/net6.0/assets/smoke-tests/prereq-packages/"/> diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs index 3fc18b357..b2c0908b9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BaselineHelper.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests { internal class BaselineHelper { - public static void Compare(string baselineFileName, IOrderedEnumerable actualEntries) + public static void CompareEntries(string baselineFileName, IOrderedEnumerable actualEntries) { IEnumerable baseline = File.ReadAllLines(GetBaselineFilePath(baselineFileName)); string[] missingEntries = actualEntries.Except(baseline).ToArray(); @@ -34,20 +34,28 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests Assert.Null(message); } - public static void Compare(string baselineFileName, string actual, ITestOutputHelper outputHelper) + public static void CompareContents(string baselineFileName, string actualContents, ITestOutputHelper outputHelper) { string baselineFilePath = GetBaselineFilePath(baselineFileName); - string baseline = File.ReadAllText(baselineFilePath); + + string actualFilePath = Path.Combine(Environment.CurrentDirectory, $"{baselineFileName}"); + File.WriteAllText(actualFilePath, actualContents); + + CompareFiles(baselineFilePath, actualFilePath, outputHelper); + } + + public static void CompareFiles(string baselineFilePath, string actualFilePath, ITestOutputHelper outputHelper) + { + string baselineFileText = File.ReadAllText(baselineFilePath); + string actualFileText = File.ReadAllText(actualFilePath); string? message = null; - if (baseline != actual) - { - string actualBaselineFilePath = Path.Combine(Environment.CurrentDirectory, $"{baselineFileName}"); - File.WriteAllText(actualBaselineFilePath, actual); + if (baselineFileText != actualFileText) + { // Retrieve a diff in order to provide a UX which calls out the diffs. - string diff = DiffFiles(baselineFilePath, actualBaselineFilePath, outputHelper); - message = $"{Environment.NewLine}Baseline '{baselineFilePath}' does not match actual '{actualBaselineFilePath}`. {Environment.NewLine}" + string diff = DiffFiles(baselineFilePath, actualFilePath, outputHelper); + message = $"{Environment.NewLine}Baseline '{baselineFilePath}' does not match actual '{actualFilePath}`. {Environment.NewLine}" + $"{diff}{Environment.NewLine}"; } @@ -63,6 +71,8 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests return diffResult.StdOut; } - private static string GetBaselineFilePath(string baselineFileName) => Path.Combine(Directory.GetCurrentDirectory(), "baselines", baselineFileName); + public static string GetAssetsDirectory() => Path.Combine(Directory.GetCurrentDirectory(), "assets"); + + private static string GetBaselineFilePath(string baselineFileName) => Path.Combine(GetAssetsDirectory(), "baselines", baselineFileName); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs new file mode 100644 index 000000000..b50a7b1d0 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs @@ -0,0 +1,47 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.IO; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public class DotNetFormatTests +{ + private const string UnformattedFileName = "FormatTestUnformatted.cs"; + private const string ExpectedFormattedFileName = "FormatTestExpectedFormatted.cs"; + + private ITestOutputHelper OutputHelper { get; } + private DotNetHelper DotNetHelper { get; } + + public DotNetFormatTests(ITestOutputHelper outputHelper) + { + OutputHelper = outputHelper; + DotNetHelper = new DotNetHelper(outputHelper); + } + + /// + /// Format an unformatted project and verify that the output matches the pre-computed solution. + /// + [Fact] + public void FormatProject() + { + string assetsDirectory = BaselineHelper.GetAssetsDirectory(); + + string unformattedCsFilePath = Path.Combine(assetsDirectory, UnformattedFileName); + string expectedFormattedCsFilePath = Path.Combine(assetsDirectory, ExpectedFormattedFileName); + + string projectDirectory = DotNetHelper.ExecuteNew("console", "C#", nameof(FormatProject), OutputHelper); + + string projectFilePath = Path.Combine(projectDirectory, nameof(FormatProject) + ".csproj"); + string formattedCsFilePath = Path.Combine(projectDirectory, UnformattedFileName); + + File.Copy(unformattedCsFilePath, formattedCsFilePath); + + DotNetHelper.ExecuteCmd($"format {projectFilePath}", OutputHelper); + + BaselineHelper.CompareFiles(expectedFormattedCsFilePath, formattedCsFilePath, OutputHelper); + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index d3385c37e..c0ba6fac7 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -13,6 +13,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal class DotNetHelper { private static readonly object s_lockObj = new object(); + private static readonly string s_timestamp = DateTime.Now.ToString("yyyyMMddHHmmssffff"); public string DotNetPath { get; } @@ -35,10 +36,22 @@ internal class DotNetHelper DotNetPath = Path.Combine(Config.DotNetDirectory, "dotnet"); } - public void ExecuteDotNetCmd(string args, ITestOutputHelper outputHelper) + public void ExecuteCmd(string args, ITestOutputHelper outputHelper) { (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess(DotNetPath, args, outputHelper); Assert.Equal(0, executeResult.Process.ExitCode); } + + /// + /// Create a new .NET project and return the path to the created project folder. + /// + public string ExecuteNew(string projectType, string language, string name, ITestOutputHelper outputHelper) + { + string outputDirectory = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{s_timestamp}", name); + + ExecuteCmd($"new {projectType} --language \"{language}\" --name {name} --output {outputDirectory}", outputHelper); + + return outputDirectory; + } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj index 0846de14b..be458761b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj @@ -18,19 +18,22 @@ - - Always - - + Always + + + + + + - + diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index 774d76c33..7feae87f3 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -53,7 +53,7 @@ public class SdkContentTests diff = RemoveVersionedPaths(diff); diff = RemoveDiffMarkers(diff); diff = RemoveRids(diff); - BaselineHelper.Compare("MsftToSbSdk.diff", diff, OutputHelper); + BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper); } private void WriteTarballFileList(string tarballPath, string outputFileName) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs index 6ebd64e7d..166883a58 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs @@ -38,7 +38,7 @@ public class SmokeTests smokeTestArgs += " --excludeOnlineTests"; } - (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess("./smoke-tests/smoke-test.sh", smokeTestArgs, OutputHelper); + (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess("./assets/smoke-tests/smoke-test.sh", smokeTestArgs, OutputHelper); Assert.Equal(0, executeResult.Process.ExitCode); } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs index 01168ef4e..46088361f 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs @@ -48,6 +48,6 @@ public class XmlDocTests } } - BaselineHelper.Compare("MissingXmlDoc.txt", missingXmlDoc.OrderBy(entry => entry)); + BaselineHelper.CompareEntries("MissingXmlDoc.txt", missingXmlDoc.OrderBy(entry => entry)); } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestExpectedFormatted.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestExpectedFormatted.cs new file mode 100644 index 000000000..81d4a3a79 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestExpectedFormatted.cs @@ -0,0 +1,11 @@ +namespace FormatTest +{ + internal class Test + { + public void Run() + { + string test = "Hello World"; + Console.WriteLine(test); + } + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs new file mode 100644 index 000000000..41dacdf1c --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/FormatTestUnformatted.cs @@ -0,0 +1,11 @@ +namespace FormatTest +{ + internal class Test + { + public void Run() + { + string test = "Hello World" ; + Console .WriteLine( test ); + } + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/local.NuGet.Config similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/local.NuGet.Config diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/smoke-test.sh similarity index 98% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/smoke-test.sh index e7edfed15..797086396 100755 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/smoke-test.sh @@ -7,8 +7,7 @@ VERSION_PREFIX=6.0 # See https://github.com/dotnet/source-build/issues/579, this version # needs to be compatible with the runtime produced from source-build DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2 -ARTIFACTS_DIR="$SCRIPT_ROOT/../../../../../../artifacts/" -__ROOT_REPO=$(sed 's/\r$//' "${ARTIFACTS_DIR}obj/rootrepo.txt") # remove CR if mounted repo on Windows drive +ARTIFACTS_DIR="$SCRIPT_ROOT/../../../../../../../artifacts/" executingUserHome=${HOME:-} export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -456,11 +455,6 @@ function copyRestoredPackages() { echo "RID to test: ${targetRid?not specified. Use ./build.sh --run-smoke-test to detect RID, or specify manually.}" -if [ "$__ROOT_REPO" != "known-good" ]; then - echo "Skipping smoke-tests since cli was not built"; - exit -fi - # Clean up and create directory if [ -e "$testingDir" ]; then rm -rf "$testingDir" From c099a557b9b59b66bfa3851c80fab8ff74caa493 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 18 Feb 2022 15:33:14 +0000 Subject: [PATCH 18/40] Add source-build patch to address arcade bootstrap issue --- ...ssue-w-System.Reflection.Metadata-du.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/SourceBuild/tarball/patches/arcade/0001-Resolve-NU1603-issue-w-System.Reflection.Metadata-du.patch diff --git a/src/SourceBuild/tarball/patches/arcade/0001-Resolve-NU1603-issue-w-System.Reflection.Metadata-du.patch b/src/SourceBuild/tarball/patches/arcade/0001-Resolve-NU1603-issue-w-System.Reflection.Metadata-du.patch new file mode 100644 index 000000000..b4d93af6f --- /dev/null +++ b/src/SourceBuild/tarball/patches/arcade/0001-Resolve-NU1603-issue-w-System.Reflection.Metadata-du.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Fri, 18 Feb 2022 15:11:39 +0000 +Subject: [PATCH] Resolve NU1603 issue w/System.Reflection.Metadata during + bootstrapping + +--- + .../Microsoft.DotNet.PackageTesting.csproj | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj +index 824dc8b..07697f8 100644 +--- a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj ++++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj +@@ -8,6 +8,13 @@ + true + + ++ ++ ++ $(NoWarn);NU1603 ++ ++ + + + From aa3dd86d7f5a002390d273cc6824736091bf3de8 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 18 Feb 2022 17:03:25 -0800 Subject: [PATCH 19/40] fix smoke-test authenticated feeds copy and smoke-test logs directory copy (#13255) --- .../common/templates/steps/source-build-build-tarball.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index 200a934b7..d4b585c34 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -87,8 +87,8 @@ steps: set -x # Use installer repo's NuGet.config during online testing to utilize internal feeds - rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config - cp NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config + rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config + cp NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" dockerEnvArgs="-e EXCLUDE_OMNISHARP_TESTS=${{ parameters.excludeOmniSharpTests}}" @@ -115,7 +115,7 @@ steps: find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; - find test/*/*/*/*/*/testing-smoke*/logs -exec cp {} --parents -t ${targetFolder} \; + find test/*/*/*/*/*/*/testing-smoke*/logs -exec cp {} --parents -t ${targetFolder} \; displayName: Prepare BuildLogs staging directory continueOnError: true condition: succeededOrFailed() From d90c8fd6d8d34277ff821261a378f974e61bb51a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 16:08:54 +0000 Subject: [PATCH 20/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220223.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22117.5 -> To Version 6.0.0-servicing.22123.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 577376c1b..603b797cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 58acc1f97a4c7b121356ea9b33b7db29b861b81d + 55ed31cf6f8046fb4b64d29ac6a7d0bc3ea82d68 From 410b4423d36dc1ef4e7f1a8191f298ff9a9a1208 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 25 Feb 2022 15:57:48 -0800 Subject: [PATCH 21/40] Make NuGet.config copy path in source-build CI more explicit (#13265) * make nuget config path in source build CI more explicit * add extra brackets to conditional in source build CI to prevent bash syntax error Co-authored-by: Michael Simons --- .../eng/common/templates/steps/source-build-build-tarball.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index d4b585c34..4ba22568a 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -88,12 +88,12 @@ steps: # Use installer repo's NuGet.config during online testing to utilize internal feeds rm -f ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config - cp NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config + cp $(Build.SourcesDirectory)/NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" dockerEnvArgs="-e EXCLUDE_OMNISHARP_TESTS=${{ parameters.excludeOmniSharpTests}}" - if [ '${{ parameters.isBootstrapped}}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]; then + if [[ '${{ parameters.isBootstrapped }}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-${{ parameters.Platform }}-${{ parameters.buildArch }}.tar.gz" -exec basename {} \;) dockerEnvArgs+=" -e MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" From 083549c2e2647012da435225f49d90b415d907ea Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 28 Feb 2022 19:38:51 -0600 Subject: [PATCH 22/40] Add source-build nowarn for NU1603 (#13289) --- .../content/repos/Directory.Build.targets | 6 ++-- ...ssue-w-System.Reflection.Metadata-du.patch | 28 ------------------- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/arcade/0001-Resolve-NU1603-issue-w-System.Reflection.Metadata-du.patch diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets index 05e685273..e49bb87ef 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets @@ -92,7 +92,9 @@ -+ -+ $(NoWarn);NU1603 -+ -+ - - - From 88bf53f7468d3e221cd49633805bc72e4bc5bfe1 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 1 Mar 2022 11:39:47 -0600 Subject: [PATCH 23/40] Adjust handling of reference packages directory (#13238) --- src/SourceBuild/tarball/content/Directory.Build.props | 11 +---------- .../tarball/content/tools-local/init-build.proj | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 51f8e3c5a..7404f02ea 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -148,18 +148,9 @@ $(PackageReportDir)poisoned.txt $(BaseOutputPath)conflict-report/ $(PackageReportDir)PrebuiltBurndownData.csv - $(IntermediatePath)reference-packages/ - $(IntermediatePath)text-only-packages/ - $(IntermediatePath)external-tarballs/ - $(ProjectDir)packages/archive/ - $(ProjectDir)packages/reference/ $(ProjectDir)packages/text-only/ - $(ReferencePackagesBaseDir)packages/ + $(ProjectDir)packages/reference/ Private.SourceBuilt.Artifacts Private.SourceBuilt.Prebuilts https://dotnetcli.azureedge.net/source-built-artifacts/assets/ diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index c5494dedd..1070cf0be 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -57,13 +57,13 @@ WorkingDirectory="$(PrebuiltPackagesPath)" Condition="'@(SourceBuiltPrebuiltsTarballFile)' != ''" /> - + - + - - - - + - - - - - - - - - - - - - - diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 3c86add19..b1896eb09 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -85,13 +85,21 @@ - - - - - + - + + + + + + + + + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg From 30bbc7d8e30b6131edae8a8b4cfdb6a3257aaf7d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Mar 2022 10:55:28 -0800 Subject: [PATCH 25/40] Update branding to 6.0.104 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 72fdc7630..968967e0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8535d69714b9d7751b7798aae59213399e8f36ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Mar 2022 19:15:25 +0000 Subject: [PATCH 26/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220301.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22123.1 -> To Version 6.0.0-servicing.22151.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 603b797cc..ac3da5920 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 55ed31cf6f8046fb4b64d29ac6a7d0bc3ea82d68 + 61308aa42850264930ffef9ad070b04e14ab74f7 From ccf17282eab19971138a655272f60b338f891c09 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 1 Mar 2022 19:17:45 -0600 Subject: [PATCH 27/40] Update source-build's MsftToSbSdk baseline (#13296) --- .../assets/baselines/MsftToSbSdk.diff | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 0a153ba87..ec672a047 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -764,14 +764,6 @@ index ------------ ./sdk/x.y.z/ref/mscorlib.dll ./sdk/x.y.z/ref/netstandard.dll @@ ------------ @@ - ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll - ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll - ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll -+./sdk/x.y.z/Roslyn/bincore/runtimes/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll ./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll ./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll ./sdk/x.y.z/Roslyn/bincore/System.Runtime.CompilerServices.Unsafe.dll From 5e3471b471b569b8a3141a55aa9a043836666ba3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 2 Mar 2022 15:58:55 -0600 Subject: [PATCH 28/40] Always run sb bootstrap CI leg (#13300) --- .../common/templates/job/source-build-run-tarball-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index a0db3872f..3871ed3d8 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -116,6 +116,9 @@ jobs: - job: Rebuild_Tarball displayName: Rebuild Tarball With Previous dependsOn: Build_Tarball + # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. + # The bootstrap build will shortcut if the stage 1 build failed. + condition: succeededOrFailed() pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ parameters.poolPublic }} From 68182c36d048767efd0e027e1002cd35dca7d0a3 Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa <91743470+dkurepa@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:22:03 -0800 Subject: [PATCH 29/40] Merge pull request #12604 from dkurepa/ResolveComponentGovernance Resolve Component Governance alerts --- src/core-sdk-tasks/AzurePublisher.cs | 3 +-- src/core-sdk-tasks/core-sdk-tasks.csproj | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core-sdk-tasks/AzurePublisher.cs b/src/core-sdk-tasks/AzurePublisher.cs index c537331be..243fad789 100644 --- a/src/core-sdk-tasks/AzurePublisher.cs +++ b/src/core-sdk-tasks/AzurePublisher.cs @@ -7,7 +7,6 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; -using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.WindowsAzure.Storage; @@ -217,4 +216,4 @@ namespace Microsoft.DotNet.Cli.Build } } } -#endif \ No newline at end of file +#endif diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f4f54d8fb..5ad1f11af 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -15,7 +15,8 @@ - + + From 3dfda061245546992b84812f584445c5e4c712da Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 3 Mar 2022 08:02:48 -0600 Subject: [PATCH 30/40] Rewrite smoke-tests.sh in new test framework based smoke tests (#13286) --- .../steps/source-build-build-tarball.yml | 6 +- .../tarball/content/Directory.Build.props | 1 + src/SourceBuild/tarball/content/build.proj | 23 +- .../BasicScenarioTests.cs | 39 ++ .../Config.cs | 25 +- .../DotNetActions.cs | 20 + .../DotNetFormatTests.cs | 15 +- .../DotNetHelper.cs | 183 +++++- .../DotNetLanguage.cs | 12 + .../DotNetLanguageExtensions.cs | 18 + .../DotNetTemplate.cs | 23 + .../DotNetTemplateExtensions.cs | 22 + .../ExecuteHelper.cs | 29 +- .../HttpClientExtensions.cs | 20 + ...icrosoft.DotNet.SourceBuild.SmokeTests.sln | 25 + .../OmniSharpTests.cs | 71 +++ .../README.md | 5 +- .../SdkContentTests.cs | 36 +- .../SkippableFactAttribute.cs | 40 ++ .../SkippableTheoryAttribute.cs | 20 + .../SmokeTests.cs | 41 +- .../TestScenario.cs | 67 +++ .../WebScenarioTests.cs | 42 ++ .../XmlDocTests.cs | 13 +- .../{smoke-tests => }/local.NuGet.Config | 1 - .../{smoke-tests => }/online.NuGet.Config | 0 .../assets/smoke-tests/smoke-test.sh | 529 ------------------ 27 files changed, 675 insertions(+), 651 deletions(-) create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs create mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/{smoke-tests => }/local.NuGet.Config (73%) rename src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/{smoke-tests => }/online.NuGet.Config (100%) delete mode 100755 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/smoke-test.sh diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml index 4ba22568a..e76a80dc3 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-build-tarball.yml @@ -91,12 +91,12 @@ steps: cp $(Build.SourcesDirectory)/NuGet.config ${{ parameters.tarballDir }}/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config dockerVolumeArgs="-v ${{ parameters.tarballDir }}:/tarball" - dockerEnvArgs="-e EXCLUDE_OMNISHARP_TESTS=${{ parameters.excludeOmniSharpTests}}" + dockerEnvArgs="-e SMOKE_TESTS_EXCLUDE_OMNISHARP=${{ parameters.excludeOmniSharpTests}}" if [[ '${{ parameters.isBootstrapped }}' != 'true' && '${{ parameters.installerBuildResourceId }}' != 'current' ]]; then dockerVolumeArgs+=" -v $(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/:/BlobArtifacts" msftSdkTarballName=$(find "$(PIPELINE.WORKSPACE)/${{ parameters.installerBuildResourceId }}/BlobArtifacts/" -name "dotnet-sdk-*-${{ parameters.Platform }}-${{ parameters.buildArch }}.tar.gz" -exec basename {} \;) - dockerEnvArgs+=" -e MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" + dockerEnvArgs+=" -e SMOKE_TESTS_MSFT_SDK_TARBALL_PATH=/BlobArtifacts/$msftSdkTarballName" fi docker run --rm $dockerVolumeArgs -w /tarball $dockerEnvArgs ${{ parameters.container }} ./build.sh --run-smoke-test ${{ parameters.additionalBuildArgs }} @@ -115,7 +115,7 @@ steps: find artifacts/prebuilt-report/ -exec cp {} --parents -t ${targetFolder} \; find src/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; find src/ -type f -name "*.log" -exec cp {} --parents -t ${targetFolder} \; - find test/*/*/*/*/*/*/testing-smoke*/logs -exec cp {} --parents -t ${targetFolder} \; + find test/ -type f -name "*.binlog" -exec cp {} --parents -t ${targetFolder} \; displayName: Prepare BuildLogs staging directory continueOnError: true condition: succeededOrFailed() diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 7404f02ea..fdc0999af 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -159,6 +159,7 @@ $(ToolsLocalDir)prebuilt-baseline.xml $(ProjectDir)test/exclusions/ + $(ProjectDir)test/Microsoft.DotNet.SourceBuild.SmokeTests/ diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj index 83b0ae6c8..fffc76ce7 100644 --- a/src/SourceBuild/tarball/content/build.proj +++ b/src/SourceBuild/tarball/content/build.proj @@ -95,10 +95,10 @@ %(SdkTarballItem.Identity) - @@ -110,21 +110,30 @@ CreateCreateSmokeTestPrereqsTarballIfPrereqsExist"/> + + $(SmokeTestsDir)bin/$(Configuration)/net6.0/ + $(SmokeTestsArtifactsDir)packages/ + + - + - + + Condition="'@(SmokeTestsPrereqs->Count())' != '0'"> $(OutputPath)dotnet-smoke-test-prereqs.$(installerOutputPackageVersion).tar.gz + $(SmokeTestsArtifactsDir)prereq-packages/ + + + WorkingDirectory="$(SmokeTestsPrereqPackagesDir)"/> diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs new file mode 100644 index 000000000..af435cfdc --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -0,0 +1,39 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.Linq; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +/// +/// Basic project create, build, run, publish scenario tests. +/// for related web scenarios. +/// They are encapsulated in a separate testclass so that they can be run in parallel. +/// +public class BasicScenarioTests : SmokeTests +{ + public BasicScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + + [Theory] + [MemberData(nameof(GetScenarioObjects))] + public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); + + private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); + + private static IEnumerable GetScenarios() + { + foreach (DotNetLanguage language in Enum.GetValues()) + { + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.Console, DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex | DotNetActions.PublishR2R); + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.ClassLib, DotNetActions.Build | DotNetActions.Publish); + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit, DotNetActions.Test); + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit, DotNetActions.Test); + yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.MSTest, DotNetActions.Test); + } + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs index 11c3ed821..739737977 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Config.cs @@ -9,15 +9,18 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal static class Config { - public static string DotNetDirectory { get; } = - Environment.GetEnvironmentVariable("DOTNET_DIR") ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet"); - public static string DotNetTarballPath { get; } = Environment.GetEnvironmentVariable(DotNetTarballPathEnv) ?? string.Empty; - public const string DotNetTarballPathEnv = "DOTNET_TARBALL_PATH"; - public static bool ExcludeOmniSharpTests { get; } = - bool.TryParse(Environment.GetEnvironmentVariable("EXCLUDE_OMNISHARP_TESTS"), out bool excludeOmniSharpTests) ? excludeOmniSharpTests : false; - public static bool ExcludeOnlineTests { get; } = - bool.TryParse(Environment.GetEnvironmentVariable("EXCLUDE_ONLINE_TESTS"), out bool excludeOnlineTests) ? excludeOnlineTests : false; - public static string MsftSdkTarballPath { get; } = Environment.GetEnvironmentVariable(MsftSdkTarballPathEnv) ?? string.Empty; - public const string MsftSdkTarballPathEnv = "MSFT_SDK_TARBALL_PATH"; - public static string TargetRid { get; } = Environment.GetEnvironmentVariable("TARGET_RID") ?? string.Empty; + public const string DotNetDirectoryEnv = "SMOKE_TESTS_DOTNET_DIR"; + public const string ExcludeOmniSharpEnv = "SMOKE_TESTS_EXCLUDE_OMNISHARP"; + public const string MsftSdkTarballPathEnv = "SMOKE_TESTS_MSFT_SDK_TARBALL_PATH"; + public const string PrereqsPathEnv = "SMOKE_TESTS_PREREQS_PATH"; + public const string SdkTarballPathEnv = "SMOKE_TESTS_SDK_TARBALL_PATH"; + public const string TargetRidEnv = "SMOKE_TESTS_TARGET_RID"; + + public static string DotNetDirectory { get; } = + Environment.GetEnvironmentVariable(DotNetDirectoryEnv) ?? Path.Combine(Directory.GetCurrentDirectory(), ".dotnet"); + public static string? MsftSdkTarballPath { get; } = Environment.GetEnvironmentVariable(MsftSdkTarballPathEnv); + public static string? PrereqsPath { get; } = Environment.GetEnvironmentVariable(PrereqsPathEnv); + public static string? SdkTarballPath { get; } = Environment.GetEnvironmentVariable(SdkTarballPathEnv); + public static string TargetRid { get; } = Environment.GetEnvironmentVariable(TargetRidEnv) ?? + throw new InvalidOperationException($"'{Config.TargetRidEnv}' must be specified"); } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs new file mode 100644 index 000000000..93ac900a9 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetActions.cs @@ -0,0 +1,20 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +[Flags] +public enum DotNetActions +{ + None = 0, + Build = 1, + Run = 2, + RunWeb = 4, + Publish = 8, + PublishComplex = 16, + PublishR2R = 32, + Test = 64, +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs index b50a7b1d0..cad0d30d4 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetFormatTests.cs @@ -8,19 +8,12 @@ using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -public class DotNetFormatTests +public class DotNetFormatTests : SmokeTests { private const string UnformattedFileName = "FormatTestUnformatted.cs"; private const string ExpectedFormattedFileName = "FormatTestExpectedFormatted.cs"; - private ITestOutputHelper OutputHelper { get; } - private DotNetHelper DotNetHelper { get; } - - public DotNetFormatTests(ITestOutputHelper outputHelper) - { - OutputHelper = outputHelper; - DotNetHelper = new DotNetHelper(outputHelper); - } + public DotNetFormatTests(ITestOutputHelper outputHelper) : base(outputHelper) { } /// /// Format an unformatted project and verify that the output matches the pre-computed solution. @@ -33,14 +26,14 @@ public class DotNetFormatTests string unformattedCsFilePath = Path.Combine(assetsDirectory, UnformattedFileName); string expectedFormattedCsFilePath = Path.Combine(assetsDirectory, ExpectedFormattedFileName); - string projectDirectory = DotNetHelper.ExecuteNew("console", "C#", nameof(FormatProject), OutputHelper); + string projectDirectory = DotNetHelper.ExecuteNew("console", nameof(FormatProject), "C#"); string projectFilePath = Path.Combine(projectDirectory, nameof(FormatProject) + ".csproj"); string formattedCsFilePath = Path.Combine(projectDirectory, UnformattedFileName); File.Copy(unformattedCsFilePath, formattedCsFilePath); - DotNetHelper.ExecuteCmd($"format {projectFilePath}", OutputHelper); + DotNetHelper.ExecuteCmd($"format {projectFilePath}"); BaselineHelper.CompareFiles(expectedFormattedCsFilePath, formattedCsFilePath, OutputHelper); } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs index c0ba6fac7..ba011b06c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs @@ -12,46 +12,199 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal class DotNetHelper { - private static readonly object s_lockObj = new object(); - private static readonly string s_timestamp = DateTime.Now.ToString("yyyyMMddHHmmssffff"); + private static readonly object s_lockObj = new(); - public string DotNetPath { get; } + public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet"); + public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs"); + public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages"); + public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}"); + + private ITestOutputHelper OutputHelper { get; } public DotNetHelper(ITestOutputHelper outputHelper) { + OutputHelper = outputHelper; + lock (s_lockObj) { if (!Directory.Exists(Config.DotNetDirectory)) { - if (!File.Exists(Config.DotNetTarballPath)) + if (!File.Exists(Config.SdkTarballPath)) { - throw new InvalidOperationException($"Tarball path '{Config.DotNetTarballPath}' specified in {Config.DotNetTarballPathEnv} does not exist."); + throw new InvalidOperationException($"Tarball path '{Config.SdkTarballPath}' specified in {Config.SdkTarballPath} does not exist."); } Directory.CreateDirectory(Config.DotNetDirectory); - ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.DotNetTarballPath} -C {Config.DotNetDirectory}", outputHelper); + ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper); + } + + if (!Directory.Exists(ProjectsDirectory)) + { + Directory.CreateDirectory(ProjectsDirectory); + InitNugetConfig(); + } + + if (!Directory.Exists(PackagesDirectory)) + { + Directory.CreateDirectory(PackagesDirectory); + } + + if (!Directory.Exists(LogsDirectory)) + { + Directory.CreateDirectory(LogsDirectory); } } - - DotNetPath = Path.Combine(Config.DotNetDirectory, "dotnet"); } - public void ExecuteCmd(string args, ITestOutputHelper outputHelper) + private static void InitNugetConfig() { - (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess(DotNetPath, args, outputHelper); + bool useLocalPackages = !string.IsNullOrEmpty(Config.PrereqsPath); + string nugetConfigPrefix = useLocalPackages ? "local" : "online"; + string nugetConfigPath = Path.Combine(ProjectsDirectory, "NuGet.Config"); + File.Copy( + Path.Combine(BaselineHelper.GetAssetsDirectory(), $"{nugetConfigPrefix}.NuGet.Config"), + nugetConfigPath); - Assert.Equal(0, executeResult.Process.ExitCode); + if (useLocalPackages) + { + if (!Directory.Exists(Config.PrereqsPath)) + { + throw new InvalidOperationException( + $"Prereqs path '{Config.PrereqsPath}' specified in {Config.PrereqsPathEnv} does not exist."); + } + + string nugetConfig = File.ReadAllText(nugetConfigPath); + nugetConfig = nugetConfig.Replace("SMOKE_TEST_PACKAGE_FEED", Config.PrereqsPath); + File.WriteAllText(nugetConfigPath, nugetConfig); + } } + public void ExecuteCmd(string args, string? workingDirectory = null) + { + (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( + DotNetPath, + args, + OutputHelper, + configure: (process) => ConfigureProcess(process, workingDirectory)); + ExecuteHelper.ValidateExitCode(executeResult); + } + + public static void ConfigureProcess(Process process, string? workingDirectory, bool setPath = false) + { + if (workingDirectory != null) + { + process.StartInfo.WorkingDirectory = workingDirectory; + } + + process.StartInfo.EnvironmentVariables["DOTNET_CLI_TELEMETRY_OPTOUT"] = "1"; + process.StartInfo.EnvironmentVariables["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; + process.StartInfo.EnvironmentVariables["DOTNET_ROOT"] = Config.DotNetDirectory; + process.StartInfo.EnvironmentVariables["NUGET_PACKAGES"] = PackagesDirectory; + + if (setPath) + { + process.StartInfo.EnvironmentVariables["PATH"] = $"{Config.DotNetDirectory}:{Environment.GetEnvironmentVariable("PATH")}"; + } + } + + public void ExecuteBuild(string projectName) => + ExecuteCmd($"build {GetBinLogOption(projectName, "build")}", GetProjectDirectory(projectName)); + /// /// Create a new .NET project and return the path to the created project folder. /// - public string ExecuteNew(string projectType, string language, string name, ITestOutputHelper outputHelper) + public string ExecuteNew(string projectType, string name, string? language = null, string? customArgs = null) { - string outputDirectory = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{s_timestamp}", name); + string projectDirectory = GetProjectDirectory(name); + string options = $"--name {name} --output {projectDirectory}"; + if (language != null) + { + options += $" --language \"{language}\""; + } + if (string.IsNullOrEmpty(customArgs)) + { + options += $" {customArgs}"; + } - ExecuteCmd($"new {projectType} --language \"{language}\" --name {name} --output {outputDirectory}", outputHelper); + ExecuteCmd($"new {projectType} {options}"); - return outputDirectory; + return projectDirectory; } + + public void ExecutePublish(string projectName, bool? selfContained = null, string? rid = null, bool trimmed = false, bool readyToRun = false) + { + string options = string.Empty; + string binlogDifferentiator = string.Empty; + + if (selfContained.HasValue) + { + options += $"--self-contained {selfContained.Value.ToString().ToLowerInvariant()}"; + if (selfContained.Value) + { + binlogDifferentiator += "self-contained"; + if (!string.IsNullOrEmpty(rid)) + { + options += $" -r {rid}"; + binlogDifferentiator += $"-{rid}"; + } + if (trimmed) + { + options += " /p:PublishTrimmed=true"; + binlogDifferentiator += "-trimmed"; + } + if (readyToRun) + { + options += " /p:PublishReadyToRun=true"; + binlogDifferentiator += "-R2R"; + } + } + } + + ExecuteCmd( + $"publish {options} {GetBinLogOption(projectName, "publish", binlogDifferentiator)}", + GetProjectDirectory(projectName)); + } + + public void ExecuteRun(string projectName) => + ExecuteCmd($"run {GetBinLogOption(projectName, "run")}", GetProjectDirectory(projectName)); + + public void ExecuteRunWeb(string projectName) + { + (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( + DotNetPath, + $"run {GetBinLogOption(projectName, "run")}", + OutputHelper, + configure: configureProcess, + millisecondTimeout: 30000); + ExecuteHelper.ValidateExitCode(executeResult); + + void configureProcess(Process process) + { + ConfigureProcess(process, GetProjectDirectory(projectName)); + + process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => + { + if (e.Data?.Contains("Application started. Press Ctrl+C to shut down.") ?? false) + { + ExecuteHelper.ExecuteProcessValidateExitCode("kill", $"-s TERM {process.Id}", OutputHelper); + } + }); + } + } + + public void ExecuteTest(string projectName) => + ExecuteCmd($"test {GetBinLogOption(projectName, "test")}", GetProjectDirectory(projectName)); + + private static string GetBinLogOption(string projectName, string command, string? differentiator = null) + { + string fileName = $"{projectName}-{command}"; + if (!string.IsNullOrEmpty(differentiator)) + { + fileName += $"-{differentiator}"; + } + + return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}"; + } + + private static string GetProjectDirectory(string projectName) => Path.Combine(ProjectsDirectory, projectName); } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs new file mode 100644 index 000000000..a26bb869c --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguage.cs @@ -0,0 +1,12 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public enum DotNetLanguage +{ + CSharp, + FSharp, + VB +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs new file mode 100644 index 000000000..6dddd8178 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetLanguageExtensions.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public static class DotNetLanguageExtensions +{ + public static string ToCliName(this DotNetLanguage language) => language switch + { + DotNetLanguage.CSharp => "C#", + DotNetLanguage.FSharp => "F#", + DotNetLanguage.VB => "VB", + _ => throw new NotImplementedException() + }; +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs new file mode 100644 index 000000000..c4570eb47 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplate.cs @@ -0,0 +1,23 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public enum DotNetTemplate +{ + Console, + ClassLib, + XUnit, + NUnit, + MSTest, + Web, + Mvc, + Razor, + BlazorWasm, + BlazorServer, + WebApi, + WebApp, + Worker, + Angular, +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs new file mode 100644 index 000000000..57c02e87d --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetTemplateExtensions.cs @@ -0,0 +1,22 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +public static class DotNetTemplateExtensions +{ + public static string GetName(this DotNetTemplate template) => Enum.GetName(template)?.ToLowerInvariant() ?? throw new NotSupportedException(); + + public static bool IsAspNetCore(this DotNetTemplate template) => + template == DotNetTemplate.Web + || template == DotNetTemplate.Mvc + || template == DotNetTemplate.WebApi + || template == DotNetTemplate.Razor + || template == DotNetTemplate.BlazorWasm + || template == DotNetTemplate.BlazorServer + || template == DotNetTemplate.Worker + || template == DotNetTemplate.Angular; +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 497211ba1..5c135b3fe 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -13,7 +13,12 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; internal static class ExecuteHelper { public static (Process Process, string StdOut, string StdErr) ExecuteProcess( - string fileName, string args, ITestOutputHelper outputHelper, bool logOutput = false) + string fileName, + string args, + ITestOutputHelper outputHelper, + bool logOutput = false, + Action? configure = null, + int millisecondTimeout = -1) { outputHelper.WriteLine($"Executing: {fileName} {args}"); @@ -36,6 +41,8 @@ internal static class ExecuteHelper process.StartInfo.Environment.Remove(key); } + configure?.Invoke(process); + StringBuilder stdOutput = new(); process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => stdOutput.AppendLine(e.Data)); @@ -45,7 +52,14 @@ internal static class ExecuteHelper process.Start(); process.BeginOutputReadLine(); process.BeginErrorReadLine(); - process.WaitForExit(); + process.WaitForExit(millisecondTimeout); + + if (!process.HasExited) + { + outputHelper.WriteLine($"Killing: {fileName} {args}"); + process.Kill(true); + process.WaitForExit(); + } string output = stdOutput.ToString().Trim(); if (logOutput && !string.IsNullOrWhiteSpace(output)) @@ -65,16 +79,21 @@ internal static class ExecuteHelper public static string ExecuteProcessValidateExitCode(string fileName, string args, ITestOutputHelper outputHelper) { (Process Process, string StdOut, string StdErr) result = ExecuteHelper.ExecuteProcess(fileName, args, outputHelper); + ValidateExitCode(result); + return result.StdOut; + } + + public static void ValidateExitCode((Process Process, string StdOut, string StdErr) result) + { if (result.Process.ExitCode != 0) { ProcessStartInfo startInfo = result.Process.StartInfo; string msg = $"Failed to execute {startInfo.FileName} {startInfo.Arguments}" + $"{Environment.NewLine}Exit code: {result.Process.ExitCode}" + - $"{Environment.NewLine}Standard Error: {result.StdErr}"; + $"{Environment.NewLine}{result.StdOut}" + + $"{Environment.NewLine}{result.StdErr}"; throw new InvalidOperationException(msg); } - - return result.StdOut; } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs new file mode 100644 index 000000000..77115c981 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/HttpClientExtensions.cs @@ -0,0 +1,20 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.IO; +using System.Net.Http; +using System.Threading.Tasks; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +internal static class HttpClientExtensions +{ + public static async Task DownloadFileAsync(this HttpClient client, Uri uri, string path) + { + using Stream stream = await client.GetStreamAsync(uri); + using FileStream fileStream = new(path, FileMode.OpenOrCreate); + await stream.CopyToAsync(fileStream); + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln new file mode 100644 index 000000000..714ed63b6 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32112.339 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.SourceBuild.SmokeTests", "Microsoft.DotNet.SourceBuild.SmokeTests.csproj", "{FEB5A0B5-460B-432A-BED8-243557188AFF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FEB5A0B5-460B-432A-BED8-243557188AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FEB5A0B5-460B-432A-BED8-243557188AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FEB5A0B5-460B-432A-BED8-243557188AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FEB5A0B5-460B-432A-BED8-243557188AFF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {75929D76-EEB5-4793-8335-DF623CC72B56} + EndGlobalSection +EndGlobal diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs new file mode 100644 index 000000000..50788019c --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -0,0 +1,71 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Diagnostics; +using System.IO; +using System.Net.Http; +using System.Threading.Tasks; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +/// +/// OmniSharp tests to ensure it works with a source-built sdk. +/// +public class OmniSharpTests : SmokeTests +{ + private string OmniSharpDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "omnisharp"); + + public OmniSharpTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + + [SkippableTheory(Config.ExcludeOmniSharpEnv, skipOnTrue: true)] + [InlineData(DotNetTemplate.BlazorWasm)] + [InlineData(DotNetTemplate.BlazorServer)] + [InlineData(DotNetTemplate.ClassLib)] + [InlineData(DotNetTemplate.Console)] + [InlineData(DotNetTemplate.MSTest)] + [InlineData(DotNetTemplate.Mvc)] + [InlineData(DotNetTemplate.NUnit)] + [InlineData(DotNetTemplate.Web)] + [InlineData(DotNetTemplate.WebApp)] + [InlineData(DotNetTemplate.WebApi)] + [InlineData(DotNetTemplate.Worker)] + [InlineData(DotNetTemplate.XUnit)] + public async void VerifyScenario(DotNetTemplate template) + { + await InitializeOmniSharp(); + + string templateName = template.GetName(); + string projectName = $"{nameof(OmniSharpTests)}_{templateName}"; + string projectDirectory = DotNetHelper.ExecuteNew(templateName, projectName); + + (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( + Path.Combine(OmniSharpDirectory, "run"), + $"-s {projectDirectory}", + OutputHelper, + logOutput: true, + millisecondTimeout: 5000, + configure: (process) => DotNetHelper.ConfigureProcess(process, projectDirectory, setPath: true)); + + Assert.NotEqual(0, executeResult.Process.ExitCode); + Assert.DoesNotContain("ERROR", executeResult.StdOut); + Assert.DoesNotContain("ERROR", executeResult.StdErr); + } + + private async Task InitializeOmniSharp() + { + if (!Directory.Exists(OmniSharpDirectory)) + { + using HttpClient client = new(); + string omniSharpTarballFile = "omnisharp-linux-x64.tar.gz"; + Uri omniSharpTarballUrl = new($"https://github.com/OmniSharp/omnisharp-roslyn/releases/latest/download/{omniSharpTarballFile}"); + await client.DownloadFileAsync(omniSharpTarballUrl, omniSharpTarballFile); + + Directory.CreateDirectory(OmniSharpDirectory); + ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {omniSharpTarballFile} -C {OmniSharpDirectory}", OutputHelper); + } + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md index 91317e44e..416492a6e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/README.md @@ -4,6 +4,7 @@ * Various configuration settings are stored in `Config.cs` ## Prereq Packages + Some prerelease scenarios, usually security updates, require non-source-built packages which are not publicly available. -Place these packages in the tarball's `packages/smoke-test-prereqs`. When prereq packages are required, the -`EXCLUDE_ONLINE_TESTS=true` environment variable should be set when running tests via `build.sh --run-smoke-test`. +Specify the directory where these packages can be found via the `SMOKE_TESTS_PREREQS_PATH` environment variable when running tests via `build.sh --run-smoke-test` e.g. +`SMOKE_TESTS_PREREQS_PATH=packages/smoke-test-prereqs`. diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs index 7feae87f3..e9f97c826 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs @@ -7,21 +7,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using Xunit; using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -public class SdkContentTests +public class SdkContentTests : SmokeTests { - private ITestOutputHelper OutputHelper { get; } - private DotNetHelper DotNetHelper { get; } - - public SdkContentTests(ITestOutputHelper outputHelper) - { - OutputHelper = outputHelper; - DotNetHelper = new DotNetHelper(outputHelper); - } + public SdkContentTests(ITestOutputHelper outputHelper) : base(outputHelper) { } /// /// Verifies the file layout of the source built sdk tarball to the Microsoft build. @@ -30,24 +22,13 @@ public class SdkContentTests /// This makes the baseline durable between releases. This does mean however, entries /// in the baseline may appear identical if the diff is version specific. /// - [Fact] + [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.MsftSdkTarballPathEnv }, skipOnNullOrWhiteSpace: true)] public void CompareMsftToSb() { - if (string.IsNullOrWhiteSpace(Config.MsftSdkTarballPath)) - { - OutputHelper.WriteLine($"skipping {nameof(CompareMsftToSb)} because {Config.MsftSdkTarballPathEnv} was not specified."); - return; - } - - if (!File.Exists(Config.MsftSdkTarballPath)) - { - throw new InvalidOperationException($"Tarball path '{Config.MsftSdkTarballPath}' specified in {Config.MsftSdkTarballPathEnv} does not exist."); - } - const string msftFileListingFileName = "msftSdkFiles.txt"; const string sbFileListingFileName = "sbSdkFiles.txt"; WriteTarballFileList(Config.MsftSdkTarballPath, msftFileListingFileName); - WriteTarballFileList(Config.DotNetTarballPath, sbFileListingFileName); + WriteTarballFileList(Config.SdkTarballPath, sbFileListingFileName); string diff = BaselineHelper.DiffFiles(msftFileListingFileName, sbFileListingFileName, OutputHelper); diff = RemoveVersionedPaths(diff); @@ -56,8 +37,13 @@ public class SdkContentTests BaselineHelper.CompareContents("MsftToSbSdk.diff", diff, OutputHelper); } - private void WriteTarballFileList(string tarballPath, string outputFileName) + private void WriteTarballFileList(string? tarballPath, string outputFileName) { + if (!File.Exists(tarballPath)) + { + throw new InvalidOperationException($"Tarball path '{tarballPath}' does not exist."); + } + string fileListing = ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"tf {tarballPath}", OutputHelper); IEnumerable files = fileListing.Split(Environment.NewLine).OrderBy(path => path); File.WriteAllLines(outputFileName, files); @@ -72,7 +58,7 @@ public class SdkContentTests return diffSegmentRegex.Replace(result, "@@ ------------ @@"); } - private string RemoveRids(string diff) => diff.Replace(Config.TargetRid, "bannana.rid"); + private static string RemoveRids(string diff) => diff.Replace(Config.TargetRid, "banana.rid"); private static string RemoveVersionedPaths(string source) { diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs new file mode 100644 index 000000000..fbe57433f --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableFactAttribute.cs @@ -0,0 +1,40 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using Xunit; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests +{ + /// + /// A Fact that will be skipped based on the specified environment variable's value. + /// + internal class SkippableFactAttribute : FactAttribute + { + public SkippableFactAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envName); + + public SkippableFactAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envNames); + + public static void CheckEnvs(bool skipOnNullOrWhiteSpace, bool skipOnTrue, Action setSkip, params string[] envNames) + { + foreach (string envName in envNames) + { + string? envValue = Environment.GetEnvironmentVariable(envName); + + if (skipOnNullOrWhiteSpace && string.IsNullOrWhiteSpace(envValue)) + { + setSkip($"Skipping because `{envName}` is null or whitespace"); + break; + } + else if (skipOnTrue && bool.TryParse(envValue, out bool boolValue) && boolValue) + { + setSkip($"Skipping because `{envName}` is set to True"); + break; + } + } + } + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs new file mode 100644 index 000000000..8ce5a4881 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SkippableTheoryAttribute.cs @@ -0,0 +1,20 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using Xunit; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests +{ + /// + /// A Theory that will be skipped based on the specified environment variable's value. + /// + internal class SkippableTheoryAttribute : TheoryAttribute + { + public SkippableTheoryAttribute(string envName, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envName); + + public SkippableTheoryAttribute(string[] envNames, bool skipOnNullOrWhiteSpace = false, bool skipOnTrue = false) => + SkippableFactAttribute.CheckEnvs(skipOnNullOrWhiteSpace, skipOnTrue, (skip) => Skip = skip, envNames); + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs index 166883a58..3c197262b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SmokeTests.cs @@ -1,45 +1,22 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; -using System.IO; -using Xunit; using Xunit.Abstractions; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -// This test suite invokes the smoke-test.sh which should be considered legacy. Those tests should be migrated to this test suite overtime. -public class SmokeTests +/// +/// Shared base class for all smoke tests. +/// +public abstract class SmokeTests { - private ITestOutputHelper OutputHelper { get; } - private DotNetHelper DotNetHelper { get; } + internal DotNetHelper DotNetHelper { get; } + internal ITestOutputHelper OutputHelper { get; } - public SmokeTests(ITestOutputHelper outputHelper) + protected SmokeTests(ITestOutputHelper outputHelper) { - OutputHelper = outputHelper; DotNetHelper = new DotNetHelper(outputHelper); - } - - [Fact] - public void SmokeTestsScript() - { - string smokeTestArgs = $"--dotnetDir {Directory.GetParent(DotNetHelper.DotNetPath)} --projectOutput --archiveRestoredPackages --targetRid {Config.TargetRid}"; - if (Config.TargetRid.Contains("osx")) - { - smokeTestArgs += " --excludeWebHttpsTests"; - } - if (Config.ExcludeOmniSharpTests) - { - smokeTestArgs += " --excludeOmniSharpTests"; - } - if (Config.ExcludeOnlineTests) - { - smokeTestArgs += " --excludeOnlineTests"; - } - - (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess("./assets/smoke-tests/smoke-test.sh", smokeTestArgs, OutputHelper); - - Assert.Equal(0, executeResult.Process.ExitCode); + OutputHelper = outputHelper; } } diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs new file mode 100644 index 000000000..29f3259c1 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs @@ -0,0 +1,67 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests +{ + public class TestScenario + { + public DotNetActions Commands { get; } + public DotNetLanguage Language { get; } + public bool NoHttps { get; set; } = Config.TargetRid.Contains("osx"); + public string ScenarioName { get; } + public DotNetTemplate Template { get; } + + public TestScenario(string scenarioName, DotNetLanguage language, DotNetTemplate template, DotNetActions commands = DotNetActions.None) + { + ScenarioName = scenarioName; + Template = template; + Language = language; + Commands = commands; + } + + internal void Execute(DotNetHelper dotNetHelper) + { + // Don't use the cli language name in the project name because it may contain '#': https://github.com/dotnet/roslyn/issues/51692 + string projectName = $"{ScenarioName}_{Template}_{Language}"; + string customNewArgs = Template.IsAspNetCore() && NoHttps ? "--no-https" : string.Empty; + dotNetHelper.ExecuteNew(Template.GetName(), projectName, Language.ToCliName(), customArgs: customNewArgs); + + if (Commands.HasFlag(DotNetActions.Build)) + { + dotNetHelper.ExecuteBuild(projectName); + } + if (Commands.HasFlag(DotNetActions.Run)) + { + if (Template.IsAspNetCore()) + { + dotNetHelper.ExecuteRunWeb(projectName); + } + else + { + dotNetHelper.ExecuteRun(projectName); + } + } + if (Commands.HasFlag(DotNetActions.Publish)) + { + dotNetHelper.ExecutePublish(projectName); + } + if (Commands.HasFlag(DotNetActions.PublishComplex)) + { + dotNetHelper.ExecutePublish(projectName, selfContained: false); + dotNetHelper.ExecutePublish(projectName, selfContained: true, Config.TargetRid); + dotNetHelper.ExecutePublish(projectName, selfContained: true, "linux-x64"); + } + if (Commands.HasFlag(DotNetActions.PublishR2R)) + { + dotNetHelper.ExecutePublish(projectName, selfContained: true, "linux-x64", trimmed: true, readyToRun: true); + } + if (Commands.HasFlag(DotNetActions.Test)) + { + dotNetHelper.ExecuteTest(projectName); + } + } + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs new file mode 100644 index 000000000..56d0368f3 --- /dev/null +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -0,0 +1,42 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Collections.Generic; +using System.Linq; +using Xunit; +using Xunit.Abstractions; + +namespace Microsoft.DotNet.SourceBuild.SmokeTests; + +/// +/// Web project create, build, run, publish scenario tests. +/// for related basic scenarios. +/// They are encapsulated in a separate testclass so that they can be run in parallel. +/// +public class WebScenarioTests : SmokeTests +{ + public WebScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { } + + [Theory] + [MemberData(nameof(GetScenarioObjects))] + public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper); + + private static IEnumerable GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario }); + + private static IEnumerable GetScenarios() + { + foreach (DotNetLanguage language in new[] { DotNetLanguage.CSharp, DotNetLanguage.FSharp }) + { + yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Web, DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex); + yield return new(nameof(WebScenarioTests), language, DotNetTemplate.Mvc, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish) { NoHttps = true }; + yield return new(nameof(WebScenarioTests), language, DotNetTemplate.WebApi, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + } + + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorServer, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish); + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Worker); + yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Angular); + } +} diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs index 46088361f..e99125700 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs @@ -4,22 +4,15 @@ using System.Collections.Generic; using System.IO; +using System.Linq; using Xunit; using Xunit.Abstractions; -using System.Linq; namespace Microsoft.DotNet.SourceBuild.SmokeTests; -public class XmlDocTests +public class XmlDocTests : SmokeTests { - private ITestOutputHelper OutputHelper { get; } - private DotNetHelper DotNetHelper { get; } - - public XmlDocTests(ITestOutputHelper outputHelper) - { - OutputHelper = outputHelper; - DotNetHelper = new DotNetHelper(outputHelper); - } + public XmlDocTests(ITestOutputHelper outputHelper) : base(outputHelper) { } /// /// Verifies every targeting pack assembly has a xml doc file. diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/local.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config similarity index 73% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/local.NuGet.Config rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config index 7e093b8fb..78195779b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/local.NuGet.Config +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/local.NuGet.Config @@ -2,7 +2,6 @@ - diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config similarity index 100% rename from src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/online.NuGet.Config rename to src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/smoke-test.sh b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/smoke-test.sh deleted file mode 100755 index 797086396..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/smoke-tests/smoke-test.sh +++ /dev/null @@ -1,529 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" -TARBALL_PREFIX=dotnet-sdk- -VERSION_PREFIX=6.0 -# See https://github.com/dotnet/source-build/issues/579, this version -# needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=6.0.0-preview.6.21355.2 -ARTIFACTS_DIR="$SCRIPT_ROOT/../../../../../../../artifacts/" -executingUserHome=${HOME:-} - -export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - -# Use uname to determine what the CPU is. -cpuName=$(uname -p) -# Some Linux platforms report unknown for platform, but the arch for machine. -if [[ "$cpuName" == "unknown" ]]; then - cpuName=$(uname -m) -fi - -case $cpuName in - aarch64) - buildArch=arm64 - ;; - amd64|x86_64) - buildArch=x64 - ;; - armv*l) - buildArch=arm - ;; - i686) - buildArch=x86 - ;; - s390x) - buildArch=s390x - ;; - *) - echo "Unknown CPU $cpuName detected, treating it as x64" - buildArch=x64 - ;; -esac - -projectOutput=false -keepProjects=false -dotnetDir="" -configuration="Release" -excludeNonWebTests=false -excludeWebTests=false -excludeWebNoHttpsTests=false -excludeWebHttpsTests=false -excludeLocalTests=false -excludeOnlineTests=false -excludeOmniSharpTests=${excludeOmniSharpTests:-false} -devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" -testingDir="$SCRIPT_ROOT/testing-smoke-$(date +"%m%d%H%M%S")" -cliDir="$testingDir/builtCli" -logsDir="$testingDir/logs" -logFile="$logsDir/smoke-test.log" -omnisharpLogFile="$logsDir/omnisharp.log" -restoredPackagesDir="$testingDir/packages" -testingHome="$testingDir/home" -archiveRestoredPackages=false -smokeTestPrebuilts="$SCRIPT_ROOT/prereq-packages" -nonSbSmokeTestPrebuilts="$SCRIPT_ROOT/non-source-built-prereq-packages" -runningOnline=false -runningHttps=false - -function usage() { - echo "" - echo "usage:" - echo " --dotnetDir the directory from which to run dotnet" - echo " --configuration the configuration being tested (default=Release)" - echo " --targetRid override the target rid to use when needed (e.g. for self-contained publish tests)" - echo " --projectOutput echo dotnet's output to console" - echo " --keepProjects keep projects after tests are complete" - echo " --minimal run minimal set of tests - local sources only, no web" - echo " --excludeNonWebTests don't run tests for non-web projects" - echo " --excludeWebTests don't run tests for web projects" - echo " --excludeWebNoHttpsTests don't run web project tests with --no-https" - echo " --excludeWebHttpsTests don't run web project tests with https using dotnet-dev-certs" - echo " --excludeLocalTests exclude tests that use local sources for nuget packages" - echo " --excludeOnlineTests exclude test that use online sources for nuget packages" - echo " --excludeOmniSharpTests don't run the OmniSharp tests" - echo " --devCertsVersion use dotnet-dev-certs instead of default $DEV_CERTS_VERSION_DEFAULT" - echo " --archiveRestoredPackages capture all restored packages to $smokeTestPrebuilts" - echo "" -} - -while :; do - if [ $# -le 0 ]; then - break - fi - - lowerI="$(echo "$1" | awk '{print tolower($0)}')" - case $lowerI in - '-?'|-h|--help) - usage - exit 0 - ;; - --dotnetdir) - shift - dotnetDir="$1" - ;; - --configuration) - shift - configuration="$1" - ;; - --targetrid) - shift - targetRid="$1" - ;; - --projectoutput) - projectOutput=true - ;; - --keepprojects) - keepProjects=true - ;; - --minimal) - excludeOnlineTests=true - ;; - --excludenonwebtests) - excludeNonWebTests=true - ;; - --excludewebtests) - excludeWebTests=true - ;; - --excludewebnohttpstests) - excludeWebNoHttpsTests=true - ;; - --excludewebhttpstests) - excludeWebHttpsTests=true - ;; - --excludelocaltests) - excludeLocalTests=true - ;; - --excludeonlinetests) - excludeOnlineTests=true - ;; - --excludeomnisharptests) - excludeOmniSharpTests=true - ;; - --devcertsversion) - shift - devCertsVersion="$1" - ;; - --archiverestoredpackages) - archiveRestoredPackages=true - ;; - *) - echo "Unrecognized argument '$1'" - usage - exit 1 - ;; - esac - - shift -done - -function doCommand() { - lang=$1 - proj=$2 - shift; shift; - - echo "starting language $lang, type $proj" | tee -a smoke-test.log - - dotnetCmd=${dotnetDir}/dotnet - - # rename '#'' to 'Sharp' to workaround https://github.com/dotnet/roslyn/issues/51692 - projectDir="${lang//#/Sharp}_${proj}" - mkdir "${projectDir}" - cd "${projectDir}" - - newArgs="new $proj -lang $lang" - - while :; do - if [ $# -le 0 ]; then - break - fi - case "$1" in - --new-arg) - shift - newArgs="$newArgs $1" - ;; - *) - break - ;; - esac - shift - done - - while :; do - if [ $# -le 0 ]; then - break - fi - - binlogOnlinePart="local" - binlogHttpsPart="nohttps" - if [ "$runningOnline" == "true" ]; then - binlogOnlinePart="online" - fi - if [ "$runningHttps" == "true" ]; then - binlogHttpsPart="https" - fi - - binlogPrefix="$logsDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_" - binlog="${binlogPrefix}$1.binlog" - echo " running $1" | tee -a "$logFile" - - if [ "$1" == "new" ]; then - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $newArgs --no-restore | tee -a "$logFile" - else - "${dotnetCmd}" $newArgs --no-restore >> "$logFile" 2>&1 - fi - elif [[ "$1" == "run" && "$proj" =~ ^(web|mvc|webapi|razor|blazorwasm|blazorserver)$ ]]; then - # A separate log file that we will over-write all the time. - exitLogFile="$testingDir/exitLogFile" - echo > "$exitLogFile" - # Run an application in the background and redirect its - # stdout+stderr to a separate process (tee). The tee process - # writes its input to 2 files: - # - Either the normal log or stdout - # - A log that's only used to find out when it's safe to kill - # the application. - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 2>&1 > >(tee -a "$exitLogFile") & - else - "${dotnetCmd}" $1 2>&1 > >(tee -a "$logFile" "$exitLogFile" >/dev/null) & - fi - webPid=$! - killCommand="pkill -SIGTERM -P $webPid" - echo " waiting up to 30 seconds for web project with pid $webPid..." - echo " to clean up manually after an interactive cancellation, run: $killCommand" - for seconds in $(seq 30); do - if grep 'Application started. Press Ctrl+C to shut down.' "$exitLogFile"; then - echo " app ready for shutdown after $seconds seconds" - break - fi - sleep 1 - done - echo " stopping $webPid" | tee -a "$logFile" - $killCommand - wait $! - echo " terminated with exit code $?" | tee -a "$logFile" - elif [ "$1" == "multi-rid-publish" ]; then - if [ "$lang" == "F#" ]; then - runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true - } - else - runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true - } - fi - if [ "$projectOutput" == "true" ]; then - runPublishScenarios | tee -a "$logFile" - else - runPublishScenarios >> "$logFile" 2>&1 - fi - else - if [ "$lang" == "F#" ]; then - # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" - else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 - fi - else - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" - else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 - fi - fi - fi - if [ $? -eq 0 ]; then - echo " $1 succeeded" >> "$logFile" - else - echo " $1 failed with exit code $?" | tee -a "$logFile" - fi - - shift - done - - cd .. - - if [ "$keepProjects" == "false" ]; then - rm -rf "${projectDir}" - fi - - echo "finished language $lang, type $proj" | tee -a smoke-test.log -} - -function setupDevCerts() { - echo "Setting up dotnet-dev-certs $devCertsVersion to generate dev certificate" | tee -a "$logFile" - ( - set -x - "$dotnetDir/dotnet" tool install -g dotnet-dev-certs --version "$devCertsVersion" --add-source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - export DOTNET_ROOT="$dotnetDir" - "$testingHome/.dotnet/tools/dotnet-dev-certs" https - ) >> "$logFile" 2>&1 -} - -function runAllTests() { - # Run tests for each language and template - if [ "$excludeNonWebTests" == "false" ]; then - doCommand C# console new restore build run multi-rid-publish - doCommand C# classlib new restore build multi-rid-publish - doCommand C# xunit new restore test - doCommand C# nunit new restore test - doCommand C# mstest new restore test - - doCommand VB console new restore build run multi-rid-publish - doCommand VB classlib new restore build multi-rid-publish - doCommand VB xunit new restore test - doCommand VB nunit new restore test - doCommand VB mstest new restore test - - doCommand F# console new restore build run multi-rid-publish - doCommand F# classlib new restore build multi-rid-publish - doCommand F# xunit new restore test - doCommand F# nunit new restore test - doCommand F# mstest new restore test - fi - - if [ "$excludeWebTests" == "false" ]; then - if [ "$excludeWebNoHttpsTests" == "false" ]; then - runningHttps=false - runWebTests --new-arg --no-https - fi - - if [ "$excludeWebHttpsTests" == "false" ]; then - runningHttps=true - setupDevCerts - runWebTests - fi - fi -} - -function runWebTests() { - doCommand C# web "$@" new restore build run multi-rid-publish - doCommand C# mvc "$@" new restore build run multi-rid-publish - doCommand C# webapi "$@" new restore build multi-rid-publish - doCommand C# razor "$@" new restore build run multi-rid-publish - doCommand C# blazorwasm "$@" new restore build run publish - doCommand C# blazorserver "$@" new restore build run publish - doCommand C# worker new restore - doCommand C# angular new restore - - doCommand F# web "$@" new restore build run multi-rid-publish - doCommand F# mvc "$@" new restore build run multi-rid-publish - doCommand F# webapi "$@" new restore build run multi-rid-publish -} - -function runOmniSharpTests() { - dotnetCmd=${dotnetDir}/dotnet - - rm -rf workdir - mkdir workdir - pushd workdir - - curl -sSLO "https://github.com/OmniSharp/omnisharp-roslyn/releases/latest/download/omnisharp-linux-x64.tar.gz" - - mkdir omnisharp - pushd omnisharp - tar xf "../omnisharp-linux-x64.tar.gz" - popd - - for project in blazorwasm blazorserver classlib console mstest mvc nunit web webapp webapi worker xunit ; do - - mkdir hello-$project - pushd hello-$project - - "${dotnetCmd}" new $project - popd - - ./omnisharp/run -s "$(readlink -f hello-$project)" > "$omnisharpLogFile" & - - sleep 5 - - pkill -P $$ - - # Omnisharp spawns off a number of processes. They all include the - # current directory as a process argument, so use that to identify and - # kill them. - pgrep -f "$(pwd)" - - kill "$(pgrep -f "$(pwd)")" - - cat "$omnisharpLogFile" - - if grep ERROR "$omnisharpLogFile"; then - echo "test failed" - exit 1 - else - echo "OK" - fi - - done - - popd -} - -function resetCaches() { - rm -rf "$testingHome" - mkdir "$testingHome" - - HOME="$testingHome" - - # clean restore path - rm -rf "$restoredPackagesDir" - - # Copy NuGet plugins if running user has HOME and we have auth. In particular, the auth plugin. - if [ "${internalPackageFeedPat:-}" ] && [ "${executingUserHome:-}" ]; then - cp -r "$executingUserHome/.nuget/" "$HOME/.nuget/" || : - fi -} - -function setupSmokeTestFeed() { - # Setup smoke-test-packages if they exist - if [ -e "$nonSbSmokeTestPrebuilts" ]; then - sed -i.bakSmokeTestFeed "s|SMOKE_TEST_PACKAGE_FEED|$nonSbSmokeTestPrebuilts|g" "$testingDir/NuGet.Config" - else - sed -i.bakSmokeTestFeed "/SMOKE_TEST_PACKAGE_FEED/d" "$testingDir/NuGet.Config" - fi -} - -function copyRestoredPackages() { - if [ "$archiveRestoredPackages" == "true" ]; then - rm -rf "$smokeTestPrebuilts" - rm -rf "$nonSbSmokeTestPrebuilts" - mkdir -p "$smokeTestPrebuilts" - mkdir -p "$nonSbSmokeTestPrebuilts" - find "$restoredPackagesDir" -iname "*.nupkg" -exec mv {} "$smokeTestPrebuilts" \; - - smokeTestPackages=$(find "$smokeTestPrebuilts" -iname "*.nupkg" -type f -printf "%f\n" | tr '[A-Z]' '[a-z]' | sort) - sourceBuiltPackages=$(find "$SOURCE_BUILT_PKGS_PATH" -iname "*.nupkg" -type f -printf "%f\n" | tr '[A-Z]' '[a-z]' | sort) - - echo "Removing smoke-test prereq packages that are source built:" - comm -23 <(printf "$smokeTestPackages") <(printf "$sourceBuiltPackages") | while read line - do - echo "$line" - cp "$smokeTestPrebuilts/$line" "$nonSbSmokeTestPrebuilts" - done - fi -} - -echo "RID to test: ${targetRid?not specified. Use ./build.sh --run-smoke-test to detect RID, or specify manually.}" - -# Clean up and create directory -if [ -e "$testingDir" ]; then - rm -rf "$testingDir" -fi - -mkdir -p "$testingDir" -mkdir -p "$logsDir" -cd "$testingDir" - -# Create blank Directory.Build files to avoid traversing to source-build infra. -echo "" | tee Directory.Build.props > Directory.Build.targets - -# Unzip dotnet if the dotnetDir is not specified -if [ "$dotnetDir" == "" ]; then - OUTPUT_DIR="$ARTIFACTS_DIR$buildArch/$configuration/" - DOTNET_TARBALL="$(ls "${OUTPUT_DIR}${TARBALL_PREFIX}${VERSION_PREFIX}"*)" - - mkdir -p "$cliDir" - tar xzf "$DOTNET_TARBALL" -C "$cliDir" - dotnetDir="$cliDir" -else - if ! [[ "$dotnetDir" = /* ]]; then - dotnetDir="$SCRIPT_ROOT/$dotnetDir" - fi -fi - -echo SDK under test is: -"$dotnetDir/dotnet" --info - -# setup restore path -export NUGET_PACKAGES="$restoredPackagesDir" -SOURCE_BUILT_PKGS_PATH="${ARTIFACTS_DIR}obj/$buildArch/$configuration/blob-feed/packages/" -export DOTNET_ROOT="$dotnetDir" -export PATH="$dotnetDir:$PATH" - -# Run all tests, online restore sources first, local restore sources second -if [ "$excludeOnlineTests" == "false" ]; then - resetCaches - runningOnline=true - # Setup NuGet.Config to use online restore sources - if [ -e "$SCRIPT_ROOT/online.NuGet.Config" ]; then - cp "$SCRIPT_ROOT/online.NuGet.Config" "$testingDir/NuGet.Config" - echo "$testingDir/NuGet.Config Contents:" - cat "$testingDir/NuGet.Config" - fi - echo "RUN ALL TESTS - ONLINE RESTORE SOURCE" - runAllTests - copyRestoredPackages - echo "ONLINE RESTORE SOURCE - ALL TESTS PASSED!" -fi - -if [ "$excludeLocalTests" == "false" ]; then - resetCaches - runningOnline=false - # Setup NuGet.Config with local restore source - if [ -e "$SCRIPT_ROOT/local.NuGet.Config" ]; then - cp "$SCRIPT_ROOT/local.NuGet.Config" "$testingDir/NuGet.Config" - sed -i.bak "s|SOURCE_BUILT_PACKAGES|$SOURCE_BUILT_PKGS_PATH|g" "$testingDir/NuGet.Config" - setupSmokeTestFeed - echo "$testingDir/NuGet.Config Contents:" - cat "$testingDir/NuGet.Config" - fi - echo "RUN ALL TESTS - LOCAL RESTORE SOURCE" - runAllTests - echo "LOCAL RESTORE SOURCE - ALL TESTS PASSED!" -fi - -if [ "$excludeOmniSharpTests" == "false" ]; then - runOmniSharpTests -fi - -echo "ALL TESTS PASSED!" From e2c59875fd78484bb5c15333d9b92cf1a9d37df5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Mar 2022 23:14:44 +0000 Subject: [PATCH 31/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220303.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22151.1 -> To Version 6.0.0-servicing.22153.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac3da5920..b8dcdf848 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 61308aa42850264930ffef9ad070b04e14ab74f7 + b624d18c4bed40e4b606beb4cd6f3a7a56b08533 From 9b9c22e77da87d99ae6469e28de42280c2ec6bf7 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 4 Mar 2022 14:10:42 +0000 Subject: [PATCH 32/40] Fix tarball CI condition --- .../eng/common/templates/job/source-build-run-tarball-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 3871ed3d8..b04465727 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -118,7 +118,7 @@ jobs: dependsOn: Build_Tarball # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. - condition: succeededOrFailed() + condition: and(${{ parameters.condition }}, succeededOrFailed()) pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ parameters.poolPublic }} From 86f1e44cd6cdfbd9488b9f185e12c194ea740f34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Mar 2022 00:12:13 +0000 Subject: [PATCH 33/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220304.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22153.2 -> To Version 6.0.0-servicing.22154.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8dcdf848..e96099d27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - b624d18c4bed40e4b606beb4cd6f3a7a56b08533 + 39632b6f0303b4a3e26fe2ac088f7b501907f5b5 From 0dc1d1a48f3343620f7ba3fa2b737f200ae976c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Mar 2022 19:42:04 -0600 Subject: [PATCH 34/40] [release/6.0.1xx] Update dependencies from dotnet/arcade (#13312) * Update dependencies from https://github.com/dotnet/arcade build 20220222.7 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7 * Remove source-build arcade patches that were backported Co-authored-by: dotnet-maestro[bot] Co-authored-by: MichaelSimons --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/generate-sbom-prep.ps1 | 19 +++ eng/common/generate-sbom-prep.sh | 22 ++++ eng/common/templates/job/job.yml | 10 ++ eng/common/templates/jobs/jobs.yml | 4 - eng/common/templates/steps/generate-sbom.yml | 44 +++++++ eng/common/templates/steps/source-build.yml | 4 +- global.json | 4 +- ...DotNet.Build.Tasks.Workloads-for-net.patch | 24 ---- ...005-Patch-sdk.props-to-target-net6.0.patch | 26 ---- ...loads-WiX-dependency-in-source-build.patch | 124 ------------------ 12 files changed, 106 insertions(+), 189 deletions(-) create mode 100644 eng/common/generate-sbom-prep.ps1 create mode 100644 eng/common/generate-sbom-prep.sh create mode 100644 eng/common/templates/steps/generate-sbom.yml delete mode 100644 src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch delete mode 100644 src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch delete mode 100644 src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8dcdf848..de7077ddf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/arcade - fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d + 7215d8265a7fbcd022eb72ff7a6e2048444c985f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 968967e0d..2dd179319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22107.2 + 6.0.0-beta.22122.7 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 new file mode 100644 index 000000000..a733a8885 --- /dev/null +++ b/eng/common/generate-sbom-prep.ps1 @@ -0,0 +1,19 @@ +Param( + [Parameter(Mandatory=$true)][string] $ManifestDirPath # Manifest directory where sbom will be placed +) + +Write-Host "Creating dir $ManifestDirPath" +# create directory for sbom manifest to be placed +if (!(Test-Path -path $ManifestDirPath)) +{ + New-Item -ItemType Directory -path $ManifestDirPath + Write-Host "Successfully created directory $ManifestDirPath" +} +else{ + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +} + +Write-Host "Updating artifact name" +$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' +Write-Host "Artifact name $artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh new file mode 100644 index 000000000..f6c774531 --- /dev/null +++ b/eng/common/generate-sbom-prep.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +source="${BASH_SOURCE[0]}" + +manifest_dir=$1 + +if [ ! -d "$manifest_dir" ] ; then + mkdir -p "$manifest_dir" + echo "Sbom directory created." $manifest_dir +else + Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." +fi + +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +echo "Artifact name before : "$artifact_name +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" +echo "Artifact name after : "$safe_artifact_name +export ARTIFACT_NAME=$safe_artifact_name +echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" + +exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 30d1de583..547d878da 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -31,6 +31,10 @@ parameters: name: '' preSteps: [] runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' jobs: - job: ${{ parameters.name }} @@ -247,3 +251,9 @@ jobs: ArtifactName: AssetManifests continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['_DotNetPublishToBlobFeed'], 'true')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 70d44735a..554e71cfc 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,10 +8,6 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false - # Optional: Disable component governance detection. In general, component governance - # should be on for all jobs. Use only in the event of issues. - disableComponentGovernance: false - # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml new file mode 100644 index 000000000..f4d7937f3 --- /dev/null +++ b/eng/common/templates/steps/generate-sbom.yml @@ -0,0 +1,44 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed + +parameters: + PackageVersion: 6.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + +- task: PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcd..ba40dc82f 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index 8d9bc761f..8a183c7de 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22107.2", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22107.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22122.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22122.7" } } diff --git a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch b/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch deleted file mode 100644 index b1cdb03da..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0005-Build-Microsoft.DotNet.Build.Tasks.Workloads-for-net.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3610fdc1ac6437973d539177c1427ed7f4f65c2e Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Fri, 27 Aug 2021 13:34:55 +0000 -Subject: [PATCH] Build Microsoft.DotNet.Build.Tasks.Workloads for net6.0 - ---- - .../src/Microsoft.DotNet.Build.Tasks.Workloads.csproj | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -index ae34705a..bda5d581 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -@@ -2,6 +2,7 @@ - - - net472;netcoreapp3.1 -+ net6.0 - true - Latest - true --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch b/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch deleted file mode 100644 index 5141348f2..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 676bb5aa455dcf877c78792e4e5a62ca6a1d72c1 Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 16:43:11 +0000 -Subject: [PATCH] Patch sdk.props to target net6.0 - -Workaround for https://github.com/dotnet/arcade/issues/7413 ---- - src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -index e3c50582..a577f923 100644 ---- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props -@@ -8,7 +8,7 @@ - --> - - -- $(MSBuildThisFileDirectory)../tools/netcoreapp3.1/ -+ $(MSBuildThisFileDirectory)../tools/net6.0/ - $(MSBuildThisFileDirectory)../tools/net472/ - - --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch b/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch deleted file mode 100644 index 188312413..000000000 --- a/src/SourceBuild/tarball/patches/arcade/0009-Disable-Workloads-WiX-dependency-in-source-build.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 8 Oct 2021 16:15:42 -0700 -Subject: [PATCH] Disable Workloads WiX dependency in source-build - -This removes the prebuilt WiX dependency: https://github.com/dotnet/arcade/issues/8014 - -The patch is temporary, pending upstream fix and dependency flow. ---- - .../src/{FileRow.cs => FileRow.wix.cs} | 0 - ...ifestMsi.cs => GenerateManifestMsi.wix.cs} | 0 - .../{GenerateMsi.cs => GenerateMsi.wix.cs} | 0 - ...erateMsiBase.cs => GenerateMsiBase.wix.cs} | 0 - ...erateVisualStudioMsiPackageProject.wix.cs} | 0 - ...cs => GenerateVisualStudioWorkload.wix.cs} | 0 - ...oadMsis.cs => GenerateWorkloadMsis.wix.cs} | 0 - ...rosoft.DotNet.Build.Tasks.Workloads.csproj | 23 ++++++++++++++++--- - ...{MsiProperties.cs => MsiProperties.wix.cs} | 0 - .../src/{MsiUtils.cs => MsiUtils.wix.cs} | 0 - ...elatedProduct.cs => RelatedProduct.wix.cs} | 0 - 11 files changed, 20 insertions(+), 3 deletions(-) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{FileRow.cs => FileRow.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateManifestMsi.cs => GenerateManifestMsi.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsi.cs => GenerateMsi.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsiBase.cs => GenerateMsiBase.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioMsiPackageProject.cs => GenerateVisualStudioMsiPackageProject.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioWorkload.cs => GenerateVisualStudioWorkload.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateWorkloadMsis.cs => GenerateWorkloadMsis.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiProperties.cs => MsiProperties.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiUtils.cs => MsiUtils.wix.cs} (100%) - rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{RelatedProduct.cs => RelatedProduct.wix.cs} (100%) - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -index 19cf67b5..2d02b7f4 100644 ---- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj -@@ -11,6 +11,16 @@ - $(NoWarn);NU5127 - false - Microsoft.DotNet.Build.Tasks.Workloads -+ -+ -+ true - - - -@@ -19,13 +29,16 @@ - - - -- - -- -+ - - - -- -+ -+ -+ -+ -+ - - - -@@ -48,6 +61,10 @@ - - - -+ -+ -+ -+ - - - -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs -diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs -similarity index 100% -rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs -rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs From 18eb0733d1c99cd3a69e0a40a7237e39b4862d5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Mar 2022 01:47:28 +0000 Subject: [PATCH 35/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220304.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22153.2 -> To Version 6.0.0-servicing.22154.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e96099d27..2f4b698ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade fe5cc1841d12196d94a4ae3b276cb92d8d7ca73d - + https://github.com/dotnet/source-build-reference-packages - 39632b6f0303b4a3e26fe2ac088f7b501907f5b5 + da5f806e2eb4d90302d1289f618012e337ba12f8 From f039e9afbc43473644917b08a97f3eb89627fcbc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 03:53:29 +0000 Subject: [PATCH 36/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220308.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22154.3 -> To Version 6.0.0-servicing.22158.1 --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64919420e..8424b7a2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,7 +211,7 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages da5f806e2eb4d90302d1289f618012e337ba12f8 From b9eebe8daeeb4d819d1a773d59da4eb772aa77a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Mar 2022 04:54:28 +0000 Subject: [PATCH 37/40] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220308.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22154.3 -> To Version 6.0.0-servicing.22158.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8424b7a2f..a749fae56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 7215d8265a7fbcd022eb72ff7a6e2048444c985f - + https://github.com/dotnet/source-build-reference-packages - da5f806e2eb4d90302d1289f618012e337ba12f8 + 2bd5e08a5ede56b51ea88ac3deecde19c5c520cb From 08f3930ac3917bb551979ca348d15b54f22ad71c Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 9 Mar 2022 06:34:39 -0800 Subject: [PATCH 38/40] Merging internal commits for release/6.0.1xx (#13347) * [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22116.1 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.1 to 6.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.2-servicing.22064.7 to 6.0.3-servicing.22115.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.2-servicing.22064.8 to 6.0.3-servicing.22115.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22053.6 to 4.0.1-1.22114.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.6 to 6.0.3-servicing.22115.5 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.2 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) * [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.2-servicing.22064.12 to 6.0.3-servicing.22116.12 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.102 to 6.0.103 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.102-servicing.22068.7 to 6.0.103-servicing.22116.11 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100 to 6.0.103 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.22114.6 to 4.0.1-1.22116.5 (parent: Microsoft.NET.Sdk) - Remove source-build aspnetcore patch to always build targeting packs because the backported fix is flowing in * Merged PR 21331: Add runtime patch to reference correct System.Reflection.MetadataLoadContext version System.Reflection.MetadataLoadContext references were using an incorrect version.props property which breaks source-build. In 6.0.3 SystemReflectionMetadataVersion was revved but not SystemReflectionMetadataLoadContextVersion therefore breaking the build because a System.Reflection.MetadataLoadContext with the SystemReflectionMetadataVersion. * Merged PR 21346: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220221.9 - **Date Produced**: February 21, 2022 7:09:27 PM UTC - **Commit**: 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1] - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22116.37 to 6.0.103-servicing.22121.9][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.103 to 6.0.103][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.103-servicing.22116.11 to 6.0.103-servicing.22121.10][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.103 to 6.0.103][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbecb321&targetVersion=GC3d6f35b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC488cbc4&targetVersion=GC988d95c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) * Merged PR 21441: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22121.10 to 6.0.103-servicing.22123.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220224.11 - **Date Produced**: February 24, 2022 8:11:47 PM UTC - **Commit**: 574686d9d185bd75770481fa76a82a0871210af4 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3] - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3] - **Microsoft.NETCor... * Merged PR 21459: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220224.18 - **Date Produced**: February 24, 2022 10:36:20 PM UTC - **Commit**: 36d5c10d65ec7577234f1b72c25e21b9512f1895 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1] - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22124.14 to 6.0.103-servicing.22124.18][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.3 to 6.0.3][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.3-servicing.22116.1 to 6.0.3-servicing.22124.3][2] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22115.6 to 6.0.3-servicing.22123.7][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.3 to 6.0.3][2] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.3-servicing.22115.10 to 6.0.3-servicing.22124.2][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC67f3050&targetVersion=GC36d5c10&_a=files [2]: https://dev.azure.com/dnceng/intern... * Update to temp SBRP version. Co-authored-by: dotnet-bot Co-authored-by: DotNet Bot Co-authored-by: Michael Simons (VISUAL STUDIO) Co-authored-by: Chris Rummel --- NuGet.config | 11 ++ eng/Version.Details.xml | 106 +++++++++--------- eng/Versions.props | 48 ++++---- ...uild-App.Ref-and-the-targeting-packs.patch | 32 ------ ...lectionMetadataLoadContextVersion-pr.patch | 44 ++++++++ 5 files changed, 132 insertions(+), 109 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch create mode 100644 src/SourceBuild/tarball/patches/runtime/0001-Define-SystemReflectionMetadataLoadContextVersion-pr.patch diff --git a/NuGet.config b/NuGet.config index 9ee0fa704..16f4f035a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -37,11 +43,16 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a749fae56..6ee2f70ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9fbd3ecd250dda95f93b0123ab017efb1e0e6033 + 1217354ca79000178dca5bca83fe6ec490e1d2d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3a25a7f1cc446b60678ed25c9d829420d6321eba + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1dcf7acfacf0fe154adcc23270cb0da11ff44ace + c911002ab43b7b989ed67090f2a48d9073d5118d https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0300fa1ff7d5c8be96d11383e99b7b5b0e4fb8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 0a0300fa1ff7d5c8be96d11383e99b7b5b0e4fb8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 - - https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-templating + f165acec106eb72d2a9e6a91c48b462884cb1c55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0649a412b8865957af7610cc9f035484f4997a + 36d5c10d65ec7577234f1b72c25e21b9512f1895 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c0649a412b8865957af7610cc9f035484f4997a + 36d5c10d65ec7577234f1b72c25e21b9512f1895 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5ad241b9633924db40503de19cb502bb0aca7718 + 1f426c90a9589dabc16d114aa91bfea9f21f8571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fb76229895cae74c1adc62c2411a0730a2f3759b + 560f243910f407df33fd5cdf06e2a857684f4bc7 https://github.com/dotnet/fsharp @@ -141,9 +141,9 @@ linker - + https://github.com/dotnet/roslyn - 9942dc957472b9bf179b11742bc161ef6c79691e + ff289c438fabbdb4755f3c92c976763705140bd9 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a + ee0a97a0009c0e048789126253fea7994db676ac https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 2dd179319..a28bc90bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.2-servicing.22064.7 + 6.0.3-servicing.22123.7 - 6.0.2-servicing.22064.8 + 6.0.3-servicing.22124.2 - 6.0.102 + 6.0.103 @@ -44,44 +44,44 @@ - 6.0.2 - 6.0.2 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 - 6.0.2-servicing.22064.12 + 6.0.3 + 6.0.3 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 0.2.0 - 6.0.102-servicing.22069.2 - 6.0.102-servicing.22069.2 + 6.0.103-servicing.22124.18 + 6.0.103-servicing.22124.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.1 + 6.0.2 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22123.9 + 6.0.3-servicing.22123.9 + 6.0.3 + 6.0.3 + 6.0.3 + 6.0.3 2.1.0 - 6.0.2-servicing.22064.6 - 6.0.2-servicing.22064.6 - 6.0.2 - 6.0.2 + 6.0.3-servicing.22124.3 + 6.0.3-servicing.22124.3 + 6.0.3 + 6.0.3 @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100 + 6.0.103 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -183,7 +183,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.0 + 6.0.2 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch b/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch deleted file mode 100644 index ef507ed95..000000000 --- a/src/SourceBuild/tarball/patches/aspnetcore/0005-Always-build-App.Ref-and-the-targeting-packs.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c5211f8557f2fb019416cf1f6c01142965270479 Mon Sep 17 00:00:00 2001 -From: Doug Bunting <6431421+dougbu@users.noreply.github.com> -Date: Sun, 16 Jan 2022 22:55:10 -0800 -Subject: [PATCH] Always build App.Ref and the targeting packs - set - `$(IsTargetingPackBuilding)` to `true` unconditionally - leave all _use_ of - `$(IsTargetingPackBuilding)` - -See https://github.com/dotnet/aspnetcore/issues/39471 for details and backporting. ---- - Directory.Build.props | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index e100d883e9..d71b308905 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -138,11 +138,7 @@ - Microsoft.AspNetCore.App.Ref - aspnetcore-runtime - aspnetcore-targeting-pack -- -- -- false -- true -+ true - - + 5.0.0 ++ 5.0.0 + 4.7.0 + 4.7.0 + 4.7.0 +diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +index 358de5541e3..abf6d26d9ef 100644 +--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj ++++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj +@@ -23,11 +23,11 @@ + + + +- ++ + + + +- ++ + + + From 519f6dc51336b6f25aee9856ac9cce085c37a9a4 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Wed, 9 Mar 2022 12:20:55 -0800 Subject: [PATCH 39/40] [6.0.1xx] Bump aspnetcore template versions (#13365) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a28bc90bf..9207cb019 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.14 + 5.0.15 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.22 + 3.1.23 3.2.1 4.8.0-rc2.19462.10 From b58bb0b579514e975abf690e62d4e461542cef52 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 9 Mar 2022 19:43:01 -0600 Subject: [PATCH 40/40] Resolve merge issues in source-build --- .../ExecuteHelper.cs | 1 + .../baselines/MissingXmlDoc.txt | 175 -- .../baselines/MsftToSbSdk.diff | 1481 ----------------- .../smoke-tests/local.NuGet.Config | 8 - .../smoke-tests/online.NuGet.Config | 9 - .../smoke-tests/smoke-test.sh | 534 ------ 6 files changed, 1 insertion(+), 2207 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config delete mode 100644 src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 41df3e75b..5c135b3fe 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -43,6 +43,7 @@ internal static class ExecuteHelper configure?.Invoke(process); + StringBuilder stdOutput = new(); process.OutputDataReceived += new DataReceivedEventHandler((sender, e) => stdOutput.AppendLine(e.Data)); StringBuilder stdError = new(); diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt deleted file mode 100644 index 8db91d9d7..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MissingXmlDoc.txt +++ /dev/null @@ -1,175 +0,0 @@ -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml -Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml -Microsoft.NETCore.App.Ref/ref/net6.0/Microsoft.VisualBasic.xml -Microsoft.NETCore.App.Ref/ref/net6.0/mscorlib.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.AppContext.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Buffers.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ComponentModel.DataAnnotations.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Configuration.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Core.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Data.DataSetExtensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Data.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Diagnostics.Debug.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Diagnostics.Tools.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Drawing.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Dynamic.Runtime.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Globalization.Calendars.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Globalization.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Globalization.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.Compression.Brotli.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.Compression.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.FileSystem.Primitives.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.FileSystem.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.UnmanagedMemoryStream.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.IO.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Net.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Numerics.Vectors.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Numerics.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Reflection.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Reflection.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Resources.Reader.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Resources.ResourceManager.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Runtime.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Runtime.Handles.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Runtime.Serialization.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Security.Principal.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Security.SecureString.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Security.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ServiceModel.Web.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ServiceProcess.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Text.Encoding.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Threading.Tasks.Extensions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Threading.Tasks.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Threading.Timer.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Transactions.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.ValueTuple.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Web.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Windows.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.Linq.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.Serialization.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.xml -Microsoft.NETCore.App.Ref/ref/net6.0/System.Xml.XmlDocument.xml -Microsoft.NETCore.App.Ref/ref/net6.0/WindowsBase.xml -NETStandard.Library.Ref/ref/netstandard2.1/Microsoft.Win32.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/mscorlib.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.AppContext.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Buffers.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Concurrent.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.NonGeneric.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.Specialized.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Collections.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Composition.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.EventBasedAsync.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.TypeConverter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ComponentModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Console.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Core.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.Common.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Data.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Contracts.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Debug.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.FileVersionInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Process.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.StackTrace.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TextWriterTraceListener.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tools.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.TraceSource.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Diagnostics.Tracing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Drawing.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Dynamic.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Calendars.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Globalization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Compression.ZipFile.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.DriveInfo.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.Watcher.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.FileSystem.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.IsolatedStorage.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.MemoryMappedFiles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.Pipes.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.UnmanagedMemoryStream.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.IO.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Expressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.Queryable.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Memory.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Http.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NameResolution.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.NetworkInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Ping.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Requests.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Security.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.Sockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebHeaderCollection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.Client.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.WebSockets.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Net.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.Vectors.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ObjectModel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.DispatchProxy.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.ILGeneration.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.Lightweight.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Emit.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Reflection.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Reader.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.ResourceManager.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Resources.Writer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.CompilerServices.VisualC.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Handles.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.RuntimeInformation.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.InteropServices.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Numerics.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Formatters.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Json.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.Serialization.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Runtime.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Claims.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Algorithms.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Csp.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.Primitives.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Cryptography.X509Certificates.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.Principal.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Security.SecureString.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ServiceModel.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.Encoding.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Text.RegularExpressions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Overlapped.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Extensions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.Parallel.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Tasks.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Thread.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.ThreadPool.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.Timer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Threading.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Transactions.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.ValueTuple.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Web.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Windows.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Linq.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.ReaderWriter.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.Serialization.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XmlSerializer.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.XDocument.xml -NETStandard.Library.Ref/ref/netstandard2.1/System.Xml.XPath.xml diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff deleted file mode 100644 index 0a153ba87..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/baselines/MsftToSbSdk.diff +++ /dev/null @@ -1,1481 +0,0 @@ -diff --git a/msftSdkFiles.txt b/sbSdkFiles.txt -index ------------ ---- a/msftSdkFiles.txt -+++ b/sbSdkFiles.txt -@@ ------------ @@ - ./host/fxr/x.y.z/ - ./host/fxr/x.y.z/libhostfxr.so - ./LICENSE.txt -+./metadata/ -+./metadata/workloads/ -+./metadata/workloads/x.y.z/ -+./metadata/workloads/x.y.z/userlocal - ./packs/ - ./packs/Microsoft.AspNetCore.App.Ref/ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ -@@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml --./packs/Microsoft.NETCore.App.Host.linux-x64/ --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/ --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/ --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/ --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/ --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/apphost --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/coreclr_delegates.h --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/hostfxr.h --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.a --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/libnethost.so --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/nethost.h --./packs/Microsoft.NETCore.App.Host.linux-x64/x.y.z/runtimes/linux-x64/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml -+./packs/Microsoft.NETCore.App.Host.bannana.rid/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/ -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/apphost -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/coreclr_delegates.h -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/hostfxr.h -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.a -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/libnethost.so -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/nethost.h -+./packs/Microsoft.NETCore.App.Host.bannana.rid/x.y.z/runtimes/bannana.rid/native/singlefilehost - ./packs/Microsoft.NETCore.App.Ref/ - ./packs/Microsoft.NETCore.App.Ref/x.y.z/ - ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ -@@ ------------ @@ - ./sdk/x.y.z/AppHostTemplate/apphost - ./sdk/x.y.z/cs/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/cs/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/cs/Microsoft.VisualStudio.Coverage.IO.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.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/cs/NuGet.Credentials.resources.dll --./sdk/x.y.z/cs/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Frameworks.resources.dll --./sdk/x.y.z/cs/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/cs/NuGet.Localization.resources.dll --./sdk/x.y.z/cs/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/cs/NuGet.Packaging.resources.dll --./sdk/x.y.z/cs/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/cs/NuGet.Protocol.resources.dll --./sdk/x.y.z/cs/NuGet.Resolver.resources.dll --./sdk/x.y.z/cs/NuGet.Versioning.resources.dll --./sdk/x.y.z/cs/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/cs/System.CommandLine.resources.dll --./sdk/x.y.z/cs/vstest.console.resources.dll - ./sdk/x.y.z/Current/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ - ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ -@@ ------------ @@ - ./sdk/x.y.z/datacollector.runtimeconfig.json - ./sdk/x.y.z/de/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/de/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/de/Microsoft.VisualStudio.Coverage.IO.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.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/de/NuGet.Credentials.resources.dll --./sdk/x.y.z/de/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/de/NuGet.Frameworks.resources.dll --./sdk/x.y.z/de/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/de/NuGet.Localization.resources.dll --./sdk/x.y.z/de/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/de/NuGet.Packaging.resources.dll --./sdk/x.y.z/de/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/de/NuGet.Protocol.resources.dll --./sdk/x.y.z/de/NuGet.Resolver.resources.dll --./sdk/x.y.z/de/NuGet.Versioning.resources.dll --./sdk/x.y.z/de/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/de/System.CommandLine.resources.dll --./sdk/x.y.z/de/vstest.console.resources.dll - ./sdk/x.y.z/dotnet-watch.deps.json - ./sdk/x.y.z/dotnet-watch.runtimeconfig.json - ./sdk/x.y.z/dotnet.deps.json -@@ ------------ @@ - ./sdk/x.y.z/dotnet.runtimeconfig.json - ./sdk/x.y.z/DotnetTools/ - ./sdk/x.y.z/DotnetTools/dotnet-dev-certs/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json --./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/ -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.deps.json -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.dll -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/dotnet-dev-certs.runtimeconfig.json -+./sdk/x.y.z/DotnetTools/dotnet-dev-certs/x.y.z/tools/netx.y/any/DotnetToolSettings.xml - ./sdk/x.y.z/DotnetTools/dotnet-format/ - ./sdk/x.y.z/DotnetTools/dotnet-format/cs/ - ./sdk/x.y.z/DotnetTools/dotnet-format/cs/dotnet-format.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/ru/System.CommandLine.resources.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Collections.Immutable.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.Rendering.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.AttributedModel.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Hosting.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.Runtime.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.TypedParts.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Diagnostics.DiagnosticSource.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/System.IO.Pipelines.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ - ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/zh-Hant/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll --./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/assets/SecretManager.targets -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.deps.json -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/dotnet-user-secrets.runtimeconfig.json -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/DotnetToolSettings.xml -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Abstractions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.FileExtensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Configuration.UserSecrets.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Abstractions.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileProviders.Physical.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Hosting.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Runtime.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.TypedParts.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotNetWatch.targets - ./sdk/x.y.z/es/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/es/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/es/Microsoft.VisualStudio.Coverage.IO.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.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/es/NuGet.Credentials.resources.dll --./sdk/x.y.z/es/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/es/NuGet.Frameworks.resources.dll --./sdk/x.y.z/es/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/es/NuGet.Localization.resources.dll --./sdk/x.y.z/es/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/es/NuGet.Packaging.resources.dll --./sdk/x.y.z/es/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/es/NuGet.Protocol.resources.dll --./sdk/x.y.z/es/NuGet.Resolver.resources.dll --./sdk/x.y.z/es/NuGet.Versioning.resources.dll --./sdk/x.y.z/es/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/es/System.CommandLine.resources.dll --./sdk/x.y.z/es/vstest.console.resources.dll - ./sdk/x.y.z/Extensions/ --./sdk/x.y.z/Extensions/cs/ --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/cs/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/de/ --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/de/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/es/ --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/es/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/fr/ --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/fr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/it/ --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/it/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ja/ --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ja/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ko/ --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ko/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/Microsoft.Diagnostics.NETCore.Client.dll - ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.BlameDataCollector.dll - ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.Extensions.EventLogCollector.dll - ./sdk/x.y.z/Extensions/Microsoft.TestPlatform.TestHostRuntimeProvider.dll - ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll - ./sdk/x.y.z/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll --./sdk/x.y.z/Extensions/pl/ --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pl/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pt-BR/ --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/pt-BR/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ru/ --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/ru/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/tr/ --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/tr/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/ --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hans/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/ --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.BlameDataCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll --./sdk/x.y.z/Extensions/zh-Hant/Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll --./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/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/fr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/fr/Microsoft.VisualStudio.Coverage.IO.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.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/fr/NuGet.Credentials.resources.dll --./sdk/x.y.z/fr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/fr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/fr/NuGet.Localization.resources.dll --./sdk/x.y.z/fr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/fr/NuGet.Packaging.resources.dll --./sdk/x.y.z/fr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/fr/NuGet.Protocol.resources.dll --./sdk/x.y.z/fr/NuGet.Resolver.resources.dll --./sdk/x.y.z/fr/NuGet.Versioning.resources.dll --./sdk/x.y.z/fr/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/fr/System.CommandLine.resources.dll --./sdk/x.y.z/fr/vstest.console.resources.dll - ./sdk/x.y.z/FSharp/ - ./sdk/x.y.z/FSharp/cs/ - ./sdk/x.y.z/FSharp/cs/FSharp.Build.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/FSharp/Microsoft.FSharp.Targets - ./sdk/x.y.z/FSharp/Microsoft.NET.StringTools.dll - ./sdk/x.y.z/FSharp/Microsoft.Portable.FSharp.Targets --./sdk/x.y.z/FSharp/Microsoft.Win32.SystemEvents.dll - ./sdk/x.y.z/FSharp/pl/ - ./sdk/x.y.z/FSharp/pl/FSharp.Build.resources.dll - ./sdk/x.y.z/FSharp/pl/FSharp.Compiler.Interactive.Settings.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/FSharp/ru/FSharp.Compiler.Service.resources.dll - ./sdk/x.y.z/FSharp/ru/FSharp.Core.resources.dll - ./sdk/x.y.z/FSharp/ru/FSharp.DependencyManager.Nuget.resources.dll --./sdk/x.y.z/FSharp/runtimes/ --./sdk/x.y.z/FSharp/runtimes/unix/ --./sdk/x.y.z/FSharp/runtimes/unix/lib/ --./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/ --./sdk/x.y.z/FSharp/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/FSharp/runtimes/win/ --./sdk/x.y.z/FSharp/runtimes/win/lib/ --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/ --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll --./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/ --./sdk/x.y.z/FSharp/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/FSharp/System.CodeDom.dll --./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll --./sdk/x.y.z/FSharp/System.Drawing.Common.dll - ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll --./sdk/x.y.z/FSharp/System.Security.Permissions.dll --./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll - ./sdk/x.y.z/FSharp/tr/FSharp.Compiler.Interactive.Settings.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/IncludedWorkloadManifests.txt - ./sdk/x.y.z/it/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/it/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/it/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll --./sdk/x.y.z/it/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/it/NuGet.Frameworks.resources.dll --./sdk/x.y.z/it/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/it/NuGet.Localization.resources.dll --./sdk/x.y.z/it/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/it/NuGet.Packaging.resources.dll --./sdk/x.y.z/it/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/it/NuGet.Protocol.resources.dll --./sdk/x.y.z/it/NuGet.Resolver.resources.dll --./sdk/x.y.z/it/NuGet.Versioning.resources.dll --./sdk/x.y.z/it/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/it/System.CommandLine.resources.dll --./sdk/x.y.z/it/vstest.console.resources.dll - ./sdk/x.y.z/ja/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ja/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ja/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll --./sdk/x.y.z/ja/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ja/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ja/NuGet.Localization.resources.dll --./sdk/x.y.z/ja/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ja/NuGet.Packaging.resources.dll --./sdk/x.y.z/ja/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ja/NuGet.Protocol.resources.dll --./sdk/x.y.z/ja/NuGet.Resolver.resources.dll --./sdk/x.y.z/ja/NuGet.Versioning.resources.dll --./sdk/x.y.z/ja/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/ja/System.CommandLine.resources.dll --./sdk/x.y.z/ja/vstest.console.resources.dll - ./sdk/x.y.z/ko/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ko/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ko/Microsoft.VisualStudio.Coverage.IO.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.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/ko/NuGet.Credentials.resources.dll --./sdk/x.y.z/ko/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ko/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ko/NuGet.Localization.resources.dll --./sdk/x.y.z/ko/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ko/NuGet.Packaging.resources.dll --./sdk/x.y.z/ko/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ko/NuGet.Protocol.resources.dll --./sdk/x.y.z/ko/NuGet.Resolver.resources.dll --./sdk/x.y.z/ko/NuGet.Versioning.resources.dll --./sdk/x.y.z/ko/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/ko/System.CommandLine.resources.dll --./sdk/x.y.z/ko/vstest.console.resources.dll - ./sdk/x.y.z/Microsoft.ApplicationInsights.dll - ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll - ./sdk/x.y.z/Microsoft.Build.dll -@@ ------------ @@ - ./sdk/x.y.z/Microsoft.DotNet.NativeWrapper.dll - ./sdk/x.y.z/Microsoft.DotNet.SdkResolver.dll - ./sdk/x.y.z/Microsoft.DotNet.TemplateLocator.dll --./sdk/x.y.z/Microsoft.Extensions.CommandLineUtils.dll - ./sdk/x.y.z/Microsoft.Extensions.Configuration.Abstractions.dll - ./sdk/x.y.z/Microsoft.Extensions.Configuration.Binder.dll - ./sdk/x.y.z/Microsoft.Extensions.Configuration.dll -@@ ------------ @@ - ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.deps.json - ./sdk/x.y.z/Microsoft.TestPlatform.PlatformAbstractions.dll - ./sdk/x.y.z/Microsoft.TestPlatform.targets -+./sdk/x.y.z/Microsoft.TestPlatform.TestHostRuntimeProvider.dll - ./sdk/x.y.z/Microsoft.TestPlatform.Utilities.dll - ./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll --./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml - ./sdk/x.y.z/Microsoft.VisualBasic.CrossTargeting.targets - ./sdk/x.y.z/Microsoft.VisualBasic.CurrentVersion.targets - ./sdk/x.y.z/Microsoft.VisualBasic.targets --./sdk/x.y.z/Microsoft.VisualStudio.Coverage.IO.dll - ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Client.dll - ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Common.dll -+./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll -+./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll - ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.deps.json - ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - ./sdk/x.y.z/Microsoft.VisualStudioVersion.v11.Common.props - ./sdk/x.y.z/Microsoft.VisualStudioVersion.v12.Common.props - ./sdk/x.y.z/Microsoft.VisualStudioVersion.v14.Common.props - ./sdk/x.y.z/Microsoft.Win32.Msi.dll --./sdk/x.y.z/Microsoft.Win32.SystemEvents.dll - ./sdk/x.y.z/Microsoft/ - ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/ - ./sdk/x.y.z/Microsoft/Microsoft.NET.Build.Extensions/Microsoft.NET.Build.Extensions.ConflictResolution.targets -@@ ------------ @@ - ./sdk/x.y.z/package.deps.json - ./sdk/x.y.z/pl/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pl/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pl/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll --./sdk/x.y.z/pl/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pl/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pl/NuGet.Localization.resources.dll --./sdk/x.y.z/pl/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pl/NuGet.Packaging.resources.dll --./sdk/x.y.z/pl/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pl/NuGet.Protocol.resources.dll --./sdk/x.y.z/pl/NuGet.Resolver.resources.dll --./sdk/x.y.z/pl/NuGet.Versioning.resources.dll --./sdk/x.y.z/pl/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/pl/System.CommandLine.resources.dll --./sdk/x.y.z/pl/vstest.console.resources.dll - ./sdk/x.y.z/pt-BR/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/pt-BR/Microsoft.VisualStudio.Coverage.IO.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.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/pt-BR/NuGet.Credentials.resources.dll --./sdk/x.y.z/pt-BR/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Frameworks.resources.dll --./sdk/x.y.z/pt-BR/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Localization.resources.dll --./sdk/x.y.z/pt-BR/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Packaging.resources.dll --./sdk/x.y.z/pt-BR/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Protocol.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Resolver.resources.dll --./sdk/x.y.z/pt-BR/NuGet.Versioning.resources.dll --./sdk/x.y.z/pt-BR/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/pt-BR/System.CommandLine.resources.dll --./sdk/x.y.z/pt-BR/vstest.console.resources.dll - ./sdk/x.y.z/ref/ -+./sdk/x.y.z/ref/Microsoft.TestPlatform.PlatformAbstractions.dll -+./sdk/x.y.z/ref/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - ./sdk/x.y.z/ref/MSBuild.dll - ./sdk/x.y.z/ref/mscorlib.dll - ./sdk/x.y.z/ref/netstandard.dll -@@ ------------ @@ - ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll - ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll - ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll -+./sdk/x.y.z/Roslyn/bincore/runtimes/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netcoreapp3.1/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll - ./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll - ./sdk/x.y.z/Roslyn/bincore/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Roslyn/bincore/tr/ - ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll - ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Roslyn/zh-Hant/Microsoft.Build.Tasks.CodeAnalysis.resources.dll - ./sdk/x.y.z/ru/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/ru/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/ru/Microsoft.VisualStudio.Coverage.IO.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.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/ru/NuGet.Credentials.resources.dll --./sdk/x.y.z/ru/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Frameworks.resources.dll --./sdk/x.y.z/ru/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/ru/NuGet.Localization.resources.dll --./sdk/x.y.z/ru/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/ru/NuGet.Packaging.resources.dll --./sdk/x.y.z/ru/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/ru/NuGet.Protocol.resources.dll --./sdk/x.y.z/ru/NuGet.Resolver.resources.dll --./sdk/x.y.z/ru/NuGet.Versioning.resources.dll --./sdk/x.y.z/ru/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/ru/System.CommandLine.resources.dll --./sdk/x.y.z/ru/vstest.console.resources.dll - ./sdk/x.y.z/RuntimeIdentifierGraph.json - ./sdk/x.y.z/runtimes/ - ./sdk/x.y.z/runtimes/any/ -@@ ------------ @@ - ./sdk/x.y.z/runtimes/any/native/NuGet.props - ./sdk/x.y.z/runtimes/any/native/NuGet.RestoreEx.targets - ./sdk/x.y.z/runtimes/any/native/NuGet.targets --./sdk/x.y.z/runtimes/unix/ --./sdk/x.y.z/runtimes/unix/lib/ --./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/ --./sdk/x.y.z/runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll -+./sdk/x.y.z/runtimes/browser/ -+./sdk/x.y.z/runtimes/browser/lib/ -+./sdk/x.y.z/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/runtimes/win/ - ./sdk/x.y.z/runtimes/win/lib/ - ./sdk/x.y.z/runtimes/win/lib/netx.y/ - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll --./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ --./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ - ./sdk/x.y.z/SdkResolvers/Microsoft.Build.NuGetSdkResolver/ -@@ ------------ @@ - ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.props - ./sdk/x.y.z/Sdks/FSharp.NET.Sdk/Sdk/Sdk.targets - ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/ -+./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/microsoft.docker.sdk.1.1.0.csproj - ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.props - ./sdk/x.y.z/Sdks/Microsoft.Docker.Sdk/Sdk/Sdk.targets -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/ -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentNoLocation.transform - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/de/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/es/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/fr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/it/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ja/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ko/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Bcl.AsyncInterfaces.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.NET.Sdk.Publish.Tasks.dll.config --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Delegation.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.Deployment.Tracing.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/Microsoft.Web.XmlTransform.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pl/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/pt-BR/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ru/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Buffers.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Encodings.Web.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Text.Json.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Threading.Tasks.Extensions.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.ValueTuple.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hans/Microsoft.NET.Sdk.Publish.Tasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/zh-Hant/Microsoft.NET.Sdk.Publish.Tasks.resources.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/ -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/tr/Microsoft.NET.Sdk.Publish.Tasks.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/netx.y/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Runtime.CompilerServices.Unsafe.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props -@@ ------------ @@ - ./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.Web/tools/netx.y/ref/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ref/Microsoft.NET.Sdk.Web.Tasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Icon.png --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/LICENSE.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WindowsForms.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.WPF.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.WinFX.targets --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/targets/System.Windows.Forms.Analyzers.props --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/THIRD-PARTY-NOTICES.TXT --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Collections.Immutable.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Numerics.Vectors.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.Metadata.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/cs/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/de/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/es/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/fr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/it/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ja/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ko/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pl/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/PresentationBuildTasks.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/pt-BR/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/ru/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/System.Reflection.MetadataLoadContext.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/tr/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hans/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/ --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/tools/netx.y/zh-Hant/PresentationBuildTasks.resources.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/useSharedDesignerContext.txt --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/version.txt - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/Sdk/Sdk.props -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/ - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/buildCrossTargeting/NuGet.Build.Tasks.Pack.targets - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/cs/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/de/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/es/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/fr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/it/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ja/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ko/NuGet.Build.Tasks.Pack.resources.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pl/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/pt-BR/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/ru/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/tr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/CoreCLR/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/cs/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/de/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/es/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/fr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/it/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ja/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ko/NuGet.Build.Tasks.Pack.resources.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Build.Tasks.Pack.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pl/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/pt-BR/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/ru/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/tr/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hans/NuGet.Build.Tasks.Pack.resources.dll --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/ --./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/zh-Hant/NuGet.Build.Tasks.Pack.resources.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/Desktop/NuGet.Versioning.dll - ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/icon.png -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Build.Tasks.Pack.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Commands.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Common.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Configuration.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Credentials.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.DependencyResolver.Core.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Frameworks.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.LibraryModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Packaging.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.ProjectModel.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Protocol.dll -+./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/NuGet.Versioning.dll - ./sdk/x.y.z/System.CodeDom.dll - ./sdk/x.y.z/System.CommandLine.dll --./sdk/x.y.z/System.Configuration.ConfigurationManager.dll -+./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll - ./sdk/x.y.z/System.Diagnostics.EventLog.dll --./sdk/x.y.z/System.Drawing.Common.dll - ./sdk/x.y.z/System.Resources.Extensions.dll --./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll -+./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll --./sdk/x.y.z/System.Security.Cryptography.Xml.dll --./sdk/x.y.z/System.Security.Permissions.dll - ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll --./sdk/x.y.z/System.Windows.Extensions.dll -+./sdk/x.y.z/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/System.Text.Encodings.Web.dll -+./sdk/x.y.z/System.Text.Json.dll -+./sdk/x.y.z/testhost.deps.json -+./sdk/x.y.z/testhost.dll -+./sdk/x.y.z/testhost.dll.config -+./sdk/x.y.z/testhost.runtimeconfig.json -+./sdk/x.y.z/testhost.x86 -+./sdk/x.y.z/testhost.x86.deps.json -+./sdk/x.y.z/testhost.x86.dll -+./sdk/x.y.z/testhost.x86.dll.config -+./sdk/x.y.z/testhost.x86.runtimeconfig.json - ./sdk/x.y.z/TestHost/ --./sdk/x.y.z/TestHost/cs/ --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/cs/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/datacollector.exe --./sdk/x.y.z/TestHost/datacollector.exe.config --./sdk/x.y.z/TestHost/de/ --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/de/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/es/ --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/es/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/fr/ --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/fr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/it/ --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/it/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/ja/ --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ja/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/ko/ --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ko/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CommunicationUtilities.dll - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CoreUtilities.dll - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.CrossPlatEngine.dll -@@ ------------ @@ - ./sdk/x.y.z/TestHost/Microsoft.TestPlatform.Utilities.dll - ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.Common.dll - ./sdk/x.y.z/TestHost/Microsoft.VisualStudio.TestPlatform.ObjectModel.dll --./sdk/x.y.z/TestHost/msdia140typelib_clr0200.dll - ./sdk/x.y.z/TestHost/Newtonsoft.Json.dll - ./sdk/x.y.z/TestHost/NuGet.Frameworks.dll --./sdk/x.y.z/TestHost/pl/ --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/pl/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/pt-BR/ --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/pt-BR/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/ru/ --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/ru/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/System.Collections.Immutable.dll --./sdk/x.y.z/TestHost/System.Reflection.Metadata.dll --./sdk/x.y.z/TestHost/testhost.exe --./sdk/x.y.z/TestHost/testhost.exe.config --./sdk/x.y.z/TestHost/testhost.net452.exe --./sdk/x.y.z/TestHost/testhost.net452.exe.config --./sdk/x.y.z/TestHost/testhost.net452.x86.exe --./sdk/x.y.z/TestHost/testhost.net452.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net46.exe --./sdk/x.y.z/TestHost/testhost.net46.exe.config --./sdk/x.y.z/TestHost/testhost.net46.x86.exe --./sdk/x.y.z/TestHost/testhost.net46.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net461.exe --./sdk/x.y.z/TestHost/testhost.net461.exe.config --./sdk/x.y.z/TestHost/testhost.net461.x86.exe --./sdk/x.y.z/TestHost/testhost.net461.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net462.exe --./sdk/x.y.z/TestHost/testhost.net462.exe.config --./sdk/x.y.z/TestHost/testhost.net462.x86.exe --./sdk/x.y.z/TestHost/testhost.net462.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net47.exe --./sdk/x.y.z/TestHost/testhost.net47.exe.config --./sdk/x.y.z/TestHost/testhost.net47.x86.exe --./sdk/x.y.z/TestHost/testhost.net47.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net471.exe --./sdk/x.y.z/TestHost/testhost.net471.exe.config --./sdk/x.y.z/TestHost/testhost.net471.x86.exe --./sdk/x.y.z/TestHost/testhost.net471.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net472.exe --./sdk/x.y.z/TestHost/testhost.net472.exe.config --./sdk/x.y.z/TestHost/testhost.net472.x86.exe --./sdk/x.y.z/TestHost/testhost.net472.x86.exe.config --./sdk/x.y.z/TestHost/testhost.net48.exe --./sdk/x.y.z/TestHost/testhost.net48.exe.config --./sdk/x.y.z/TestHost/testhost.net48.x86.exe --./sdk/x.y.z/TestHost/testhost.net48.x86.exe.config --./sdk/x.y.z/TestHost/testhost.x86.exe --./sdk/x.y.z/TestHost/testhost.x86.exe.config --./sdk/x.y.z/TestHost/tr/ --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/tr/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/x64/ --./sdk/x.y.z/TestHost/x64/msdia140.dll --./sdk/x.y.z/TestHost/x64/msdia140.dll.manifest --./sdk/x.y.z/TestHost/x86/ --./sdk/x.y.z/TestHost/x86/msdia140.dll --./sdk/x.y.z/TestHost/x86/msdia140.dll.manifest --./sdk/x.y.z/TestHost/zh-Hans/ --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/zh-Hans/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/ --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.Common.resources.dll --./sdk/x.y.z/TestHost/zh-Hant/Microsoft.VisualStudio.TestPlatform.ObjectModel.resources.dll -+./sdk/x.y.z/TestHost/ref/ -+./sdk/x.y.z/TestHost/ref/testhost.dll -+./sdk/x.y.z/TestHost/ref/testhost.x86.dll -+./sdk/x.y.z/TestHost/testhost.deps.json -+./sdk/x.y.z/TestHost/testhost.dll -+./sdk/x.y.z/TestHost/testhost.dll.config -+./sdk/x.y.z/TestHost/testhost.runtimeconfig.json -+./sdk/x.y.z/TestHost/testhost.x86 -+./sdk/x.y.z/TestHost/testhost.x86.deps.json -+./sdk/x.y.z/TestHost/testhost.x86.dll -+./sdk/x.y.z/TestHost/testhost.x86.dll.config -+./sdk/x.y.z/TestHost/testhost.x86.runtimeconfig.json - ./sdk/x.y.z/tr/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/tr/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/tr/Microsoft.VisualStudio.Coverage.IO.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.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/tr/NuGet.Credentials.resources.dll --./sdk/x.y.z/tr/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Frameworks.resources.dll --./sdk/x.y.z/tr/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/tr/NuGet.Localization.resources.dll --./sdk/x.y.z/tr/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/tr/NuGet.Packaging.resources.dll --./sdk/x.y.z/tr/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/tr/NuGet.Protocol.resources.dll --./sdk/x.y.z/tr/NuGet.Resolver.resources.dll --./sdk/x.y.z/tr/NuGet.Versioning.resources.dll --./sdk/x.y.z/tr/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/tr/System.CommandLine.resources.dll --./sdk/x.y.z/tr/vstest.console.resources.dll -+./sdk/x.y.z/vstest.console - ./sdk/x.y.z/vstest.console.deps.json - ./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/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hans/Microsoft.VisualStudio.Coverage.IO.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.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/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hans/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/zh-Hans/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hans/vstest.console.resources.dll - ./sdk/x.y.z/zh-Hant/ - ./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.TemplateEngine.Edge.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CoreUtilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CrossPlatEngine.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Utilities.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.resources.dll --./sdk/x.y.z/zh-Hant/Microsoft.VisualStudio.Coverage.IO.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.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/zh-Hant/NuGet.Credentials.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.DependencyResolver.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Frameworks.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.LibraryModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Localization.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.PackageManagement.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.Core.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Packaging.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.ProjectModel.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Protocol.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Resolver.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.Versioning.resources.dll --./sdk/x.y.z/zh-Hant/NuGet.VisualStudio.Contracts.resources.dll - ./sdk/x.y.z/zh-Hant/System.CommandLine.resources.dll --./sdk/x.y.z/zh-Hant/vstest.console.resources.dll - ./shared/ - ./shared/Microsoft.AspNetCore.App/ - ./shared/Microsoft.AspNetCore.App/x.y.z/ -@@ ------------ @@ - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Extensions.WebEncoders.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.JSInterop.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/Microsoft.Net.Http.Headers.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.DiagnosticSource.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Diagnostics.EventLog.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Formats.Asn1.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.IO.Pipelines.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Runtime.CompilerServices.Unsafe.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.AccessControl.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Pkcs.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/System.Security.Cryptography.Xml.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Encodings.Web.dll -+./shared/Microsoft.AspNetCore.App/x.y.z/System.Text.Json.dll - ./shared/Microsoft.AspNetCore.App/x.y.z/THIRD-PARTY-NOTICES.txt - ./shared/Microsoft.NETCore.App/ - ./shared/Microsoft.NETCore.App/x.y.z/ \ No newline at end of file diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config deleted file mode 100644 index 7e093b8fb..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/local.NuGet.Config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config deleted file mode 100644 index 59db1a3f1..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/online.NuGet.Config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh deleted file mode 100644 index cd08e9f4e..000000000 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/smoke-tests/smoke-test.sh +++ /dev/null @@ -1,534 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)" -TARBALL_PREFIX=dotnet-sdk- -VERSION_PREFIX=6.0 -# See https://github.com/dotnet/source-build/issues/579, this version -# needs to be compatible with the runtime produced from source-build -DEV_CERTS_VERSION_DEFAULT=6.0.0-rtm.21573.1 -__ROOT_REPO=$(sed 's/\r$//' "$SCRIPT_ROOT/artifacts/obj/rootrepo.txt") # remove CR if mounted repo on Windows drive -executingUserHome=${HOME:-} - -export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - -# Use uname to determine what the CPU is. -cpuName=$(uname -p) -# Some Linux platforms report unknown for platform, but the arch for machine. -if [[ "$cpuName" == "unknown" ]]; then - cpuName=$(uname -m) -fi - -case $cpuName in - aarch64) - buildArch=arm64 - ;; - amd64|x86_64) - buildArch=x64 - ;; - armv*l) - buildArch=arm - ;; - i686) - buildArch=x86 - ;; - s390x) - buildArch=s390x - ;; - *) - echo "Unknown CPU $cpuName detected, treating it as x64" - buildArch=x64 - ;; -esac - -projectOutput=false -keepProjects=false -dotnetDir="" -configuration="Release" -excludeNonWebTests=false -excludeWebTests=false -excludeWebNoHttpsTests=false -excludeWebHttpsTests=false -excludeLocalTests=false -excludeOnlineTests=false -excludeOmniSharpTests=${excludeOmniSharpTests:-false} -devCertsVersion="$DEV_CERTS_VERSION_DEFAULT" -testingDir="$SCRIPT_ROOT/testing-smoke-$(date +"%m%d%H%M%S")" -cliDir="$testingDir/builtCli" -logsDir="$testingDir/logs" -logFile="$logsDir/smoke-test.log" -omnisharpLogFile="$logsDir/omnisharp.log" -restoredPackagesDir="$testingDir/packages" -testingHome="$testingDir/home" -archiveRestoredPackages=false -smokeTestPrebuilts="$SCRIPT_ROOT/prereq-packages" -nonSbSmokeTestPrebuilts="$SCRIPT_ROOT/non-source-built-prereq-packages" -runningOnline=false -runningHttps=false - -function usage() { - echo "" - echo "usage:" - echo " --dotnetDir the directory from which to run dotnet" - echo " --configuration the configuration being tested (default=Release)" - echo " --targetRid override the target rid to use when needed (e.g. for self-contained publish tests)" - echo " --projectOutput echo dotnet's output to console" - echo " --keepProjects keep projects after tests are complete" - echo " --minimal run minimal set of tests - local sources only, no web" - echo " --excludeNonWebTests don't run tests for non-web projects" - echo " --excludeWebTests don't run tests for web projects" - echo " --excludeWebNoHttpsTests don't run web project tests with --no-https" - echo " --excludeWebHttpsTests don't run web project tests with https using dotnet-dev-certs" - echo " --excludeLocalTests exclude tests that use local sources for nuget packages" - echo " --excludeOnlineTests exclude test that use online sources for nuget packages" - echo " --excludeOmniSharpTests don't run the OmniSharp tests" - echo " --devCertsVersion use dotnet-dev-certs instead of default $DEV_CERTS_VERSION_DEFAULT" - echo " --archiveRestoredPackages capture all restored packages to $smokeTestPrebuilts" - echo "" -} - -while :; do - if [ $# -le 0 ]; then - break - fi - - lowerI="$(echo "$1" | awk '{print tolower($0)}')" - case $lowerI in - '-?'|-h|--help) - usage - exit 0 - ;; - --dotnetdir) - shift - dotnetDir="$1" - ;; - --configuration) - shift - configuration="$1" - ;; - --targetrid) - shift - targetRid="$1" - ;; - --projectoutput) - projectOutput=true - ;; - --keepprojects) - keepProjects=true - ;; - --minimal) - excludeOnlineTests=true - ;; - --excludenonwebtests) - excludeNonWebTests=true - ;; - --excludewebtests) - excludeWebTests=true - ;; - --excludewebnohttpstests) - excludeWebNoHttpsTests=true - ;; - --excludewebhttpstests) - excludeWebHttpsTests=true - ;; - --excludelocaltests) - excludeLocalTests=true - ;; - --excludeonlinetests) - excludeOnlineTests=true - ;; - --excludeomnisharptests) - excludeOmniSharpTests=true - ;; - --devcertsversion) - shift - devCertsVersion="$1" - ;; - --archiverestoredpackages) - archiveRestoredPackages=true - ;; - *) - echo "Unrecognized argument '$1'" - usage - exit 1 - ;; - esac - - shift -done - -function doCommand() { - lang=$1 - proj=$2 - shift; shift; - - echo "starting language $lang, type $proj" | tee -a smoke-test.log - - dotnetCmd=${dotnetDir}/dotnet - - # rename '#'' to 'Sharp' to workaround https://github.com/dotnet/roslyn/issues/51692 - projectDir="${lang//#/Sharp}_${proj}" - mkdir "${projectDir}" - cd "${projectDir}" - - newArgs="new $proj -lang $lang" - - while :; do - if [ $# -le 0 ]; then - break - fi - case "$1" in - --new-arg) - shift - newArgs="$newArgs $1" - ;; - *) - break - ;; - esac - shift - done - - while :; do - if [ $# -le 0 ]; then - break - fi - - binlogOnlinePart="local" - binlogHttpsPart="nohttps" - if [ "$runningOnline" == "true" ]; then - binlogOnlinePart="online" - fi - if [ "$runningHttps" == "true" ]; then - binlogHttpsPart="https" - fi - - binlogPrefix="$logsDir/${projectDir}_${binlogOnlinePart}_${binlogHttpsPart}_" - binlog="${binlogPrefix}$1.binlog" - echo " running $1" | tee -a "$logFile" - - if [ "$1" == "new" ]; then - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $newArgs --no-restore | tee -a "$logFile" - else - "${dotnetCmd}" $newArgs --no-restore >> "$logFile" 2>&1 - fi - elif [[ "$1" == "run" && "$proj" =~ ^(web|mvc|webapi|razor|blazorwasm|blazorserver)$ ]]; then - # A separate log file that we will over-write all the time. - exitLogFile="$testingDir/exitLogFile" - echo > "$exitLogFile" - # Run an application in the background and redirect its - # stdout+stderr to a separate process (tee). The tee process - # writes its input to 2 files: - # - Either the normal log or stdout - # - A log that's only used to find out when it's safe to kill - # the application. - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 2>&1 > >(tee -a "$exitLogFile") & - else - "${dotnetCmd}" $1 2>&1 > >(tee -a "$logFile" "$exitLogFile" >/dev/null) & - fi - webPid=$! - killCommand="pkill -SIGTERM -P $webPid" - echo " waiting up to 30 seconds for web project with pid $webPid..." - echo " to clean up manually after an interactive cancellation, run: $killCommand" - for seconds in $(seq 30); do - if grep 'Application started. Press Ctrl+C to shut down.' "$exitLogFile"; then - echo " app ready for shutdown after $seconds seconds" - break - fi - sleep 1 - done - echo " stopping $webPid" | tee -a "$logFile" - $killCommand - wait $! - echo " terminated with exit code $?" | tee -a "$logFile" - elif [ "$1" == "multi-rid-publish" ]; then - if [ "$lang" == "F#" ]; then - runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true - } - else - runPublishScenarios() { - "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" - "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" - "${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-R2R-portable.binlog" /p:PublishTrimmed=true /p:PublishReadyToRun=true - } - fi - if [ "$projectOutput" == "true" ]; then - runPublishScenarios | tee -a "$logFile" - else - runPublishScenarios >> "$logFile" 2>&1 - fi - else - if [ "$lang" == "F#" ]; then - # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554 - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" - else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 - fi - else - if [ "$projectOutput" == "true" ]; then - "${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" - else - "${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 - fi - fi - fi - if [ $? -eq 0 ]; then - echo " $1 succeeded" >> "$logFile" - else - echo " $1 failed with exit code $?" | tee -a "$logFile" - fi - - shift - done - - cd .. - - if [ "$keepProjects" == "false" ]; then - rm -rf "${projectDir}" - fi - - echo "finished language $lang, type $proj" | tee -a smoke-test.log -} - -function setupDevCerts() { - echo "Setting up dotnet-dev-certs $devCertsVersion to generate dev certificate" | tee -a "$logFile" - ( - set -x - "$dotnetDir/dotnet" tool install -g dotnet-dev-certs --version "$devCertsVersion" --add-source https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json - export DOTNET_ROOT="$dotnetDir" - "$testingHome/.dotnet/tools/dotnet-dev-certs" https - ) >> "$logFile" 2>&1 -} - -function runAllTests() { - # Run tests for each language and template - if [ "$excludeNonWebTests" == "false" ]; then - doCommand C# console new restore build run multi-rid-publish - doCommand C# classlib new restore build multi-rid-publish - doCommand C# xunit new restore test - doCommand C# nunit new restore test - doCommand C# mstest new restore test - - doCommand VB console new restore build run multi-rid-publish - doCommand VB classlib new restore build multi-rid-publish - doCommand VB xunit new restore test - doCommand VB nunit new restore test - doCommand VB mstest new restore test - - doCommand F# console new restore build run multi-rid-publish - doCommand F# classlib new restore build multi-rid-publish - doCommand F# xunit new restore test - doCommand F# nunit new restore test - doCommand F# mstest new restore test - fi - - if [ "$excludeWebTests" == "false" ]; then - if [ "$excludeWebNoHttpsTests" == "false" ]; then - runningHttps=false - runWebTests --new-arg --no-https - fi - - if [ "$excludeWebHttpsTests" == "false" ]; then - runningHttps=true - setupDevCerts - runWebTests - fi - fi -} - -function runWebTests() { - doCommand C# web "$@" new restore build run multi-rid-publish - doCommand C# mvc "$@" new restore build run multi-rid-publish - doCommand C# webapi "$@" new restore build multi-rid-publish - doCommand C# razor "$@" new restore build run multi-rid-publish - doCommand C# blazorwasm "$@" new restore build run publish - doCommand C# blazorserver "$@" new restore build run publish - doCommand C# worker new restore - doCommand C# angular new restore - - doCommand F# web "$@" new restore build run multi-rid-publish - doCommand F# mvc "$@" new restore build run multi-rid-publish - doCommand F# webapi "$@" new restore build run multi-rid-publish -} - -function runOmniSharpTests() { - dotnetCmd=${dotnetDir}/dotnet - - rm -rf workdir - mkdir workdir - pushd workdir - - curl -sSLO "https://github.com/OmniSharp/omnisharp-roslyn/releases/latest/download/omnisharp-linux-x64.tar.gz" - - mkdir omnisharp - pushd omnisharp - tar xf "../omnisharp-linux-x64.tar.gz" - popd - - for project in blazorwasm blazorserver classlib console mstest mvc nunit web webapp webapi worker xunit ; do - - mkdir hello-$project - pushd hello-$project - - "${dotnetCmd}" new $project - popd - - ./omnisharp/run -s "$(readlink -f hello-$project)" > "$omnisharpLogFile" & - - sleep 5 - - pkill -P $$ - - # Omnisharp spawns off a number of processes. They all include the - # current directory as a process argument, so use that to identify and - # kill them. - pgrep -f "$(pwd)" - - kill "$(pgrep -f "$(pwd)")" - - cat "$omnisharpLogFile" - - if grep ERROR "$omnisharpLogFile"; then - echo "test failed" - exit 1 - else - echo "OK" - fi - - done - - popd -} - -function resetCaches() { - rm -rf "$testingHome" - mkdir "$testingHome" - - HOME="$testingHome" - - # clean restore path - rm -rf "$restoredPackagesDir" - - # Copy NuGet plugins if running user has HOME and we have auth. In particular, the auth plugin. - if [ "${internalPackageFeedPat:-}" ] && [ "${executingUserHome:-}" ]; then - cp -r "$executingUserHome/.nuget/" "$HOME/.nuget/" || : - fi -} - -function setupSmokeTestFeed() { - # Setup smoke-test-packages if they exist - if [ -e "$nonSbSmokeTestPrebuilts" ]; then - sed -i.bakSmokeTestFeed "s|SMOKE_TEST_PACKAGE_FEED|$nonSbSmokeTestPrebuilts|g" "$testingDir/NuGet.Config" - else - sed -i.bakSmokeTestFeed "/SMOKE_TEST_PACKAGE_FEED/d" "$testingDir/NuGet.Config" - fi -} - -function copyRestoredPackages() { - if [ "$archiveRestoredPackages" == "true" ]; then - rm -rf "$smokeTestPrebuilts" - rm -rf "$nonSbSmokeTestPrebuilts" - mkdir -p "$smokeTestPrebuilts" - mkdir -p "$nonSbSmokeTestPrebuilts" - find "$restoredPackagesDir" -iname "*.nupkg" -exec mv {} "$smokeTestPrebuilts" \; - - smokeTestPackages=$(find "$smokeTestPrebuilts" -iname "*.nupkg" -type f -printf "%f\n" | tr '[A-Z]' '[a-z]' | sort) - sourceBuiltPackages=$(find "$SOURCE_BUILT_PKGS_PATH" -iname "*.nupkg" -type f -printf "%f\n" | tr '[A-Z]' '[a-z]' | sort) - - echo "Removing smoke-test prereq packages that are source built:" - comm -23 <(printf "$smokeTestPackages") <(printf "$sourceBuiltPackages") | while read line - do - echo "$line" - cp "$smokeTestPrebuilts/$line" "$nonSbSmokeTestPrebuilts" - done - fi -} - -echo "RID to test: ${targetRid?not specified. Use ./build.sh --run-smoke-test to detect RID, or specify manually.}" - -if [ "$__ROOT_REPO" != "known-good" ]; then - echo "Skipping smoke-tests since cli was not built"; - exit -fi - -# Clean up and create directory -if [ -e "$testingDir" ]; then - rm -rf "$testingDir" -fi - -mkdir -p "$testingDir" -mkdir -p "$logsDir" -cd "$testingDir" - -# Create blank Directory.Build files to avoid traversing to source-build infra. -echo "" | tee Directory.Build.props > Directory.Build.targets - -# Unzip dotnet if the dotnetDir is not specified -if [ "$dotnetDir" == "" ]; then - OUTPUT_DIR="$ARTIFACTS_DIR$buildArch/$configuration/" - DOTNET_TARBALL="$(ls "${OUTPUT_DIR}${TARBALL_PREFIX}${VERSION_PREFIX}"*)" - - mkdir -p "$cliDir" - tar xzf "$DOTNET_TARBALL" -C "$cliDir" - dotnetDir="$cliDir" -else - if ! [[ "$dotnetDir" = /* ]]; then - dotnetDir="$SCRIPT_ROOT/$dotnetDir" - fi -fi - -echo SDK under test is: -"$dotnetDir/dotnet" --info - -# setup restore path -export NUGET_PACKAGES="$restoredPackagesDir" -SOURCE_BUILT_PKGS_PATH="${ARTIFACTS_DIR}obj/$buildArch/$configuration/blob-feed/packages/" -export DOTNET_ROOT="$dotnetDir" -export PATH="$dotnetDir:$PATH" - -# Run all tests, online restore sources first, local restore sources second -if [ "$excludeOnlineTests" == "false" ]; then - resetCaches - runningOnline=true - # Setup NuGet.Config to use online restore sources - if [ -e "$SCRIPT_ROOT/online.NuGet.Config" ]; then - cp "$SCRIPT_ROOT/online.NuGet.Config" "$testingDir/NuGet.Config" - echo "$testingDir/NuGet.Config Contents:" - cat "$testingDir/NuGet.Config" - fi - echo "RUN ALL TESTS - ONLINE RESTORE SOURCE" - runAllTests - copyRestoredPackages - echo "ONLINE RESTORE SOURCE - ALL TESTS PASSED!" -fi - -if [ "$excludeLocalTests" == "false" ]; then - resetCaches - runningOnline=false - # Setup NuGet.Config with local restore source - if [ -e "$SCRIPT_ROOT/local.NuGet.Config" ]; then - cp "$SCRIPT_ROOT/local.NuGet.Config" "$testingDir/NuGet.Config" - sed -i.bak "s|SOURCE_BUILT_PACKAGES|$SOURCE_BUILT_PKGS_PATH|g" "$testingDir/NuGet.Config" - setupSmokeTestFeed - echo "$testingDir/NuGet.Config Contents:" - cat "$testingDir/NuGet.Config" - fi - echo "RUN ALL TESTS - LOCAL RESTORE SOURCE" - runAllTests - echo "LOCAL RESTORE SOURCE - ALL TESTS PASSED!" -fi - -if [ "$excludeOmniSharpTests" == "false" ]; then - runOmniSharpTests -fi - -echo "ALL TESTS PASSED!"