diff --git a/NuGet.config b/NuGet.config index 6812f9b81..459c393cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,6 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be14086c8..5033e241e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + 55fa299ca45a3c19e8970e6afba34951e368525a - + https://github.com/dotnet/templating - 7d941613047c847c87dc8d243a54fd1a45a47de7 + 55fa299ca45a3c19e8970e6afba34951e368525a - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36621631f5982fb9d23644aec68222015ba337a2 + + https://github.com/dotnet/sdk + 6ca80ba4d8c6f3087176440622bbdb90e78d3708 - - https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 36621631f5982fb9d23644aec68222015ba337a2 + + https://github.com/dotnet/sdk + 6ca80ba4d8c6f3087176440622bbdb90e78d3708 @@ -121,18 +121,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 0350d04790959e8ebdd3ceab0d34a40f811f019d - + https://github.com/dotnet/fsharp - 6d626ff0752a77d339f609b4d361787dc9ca93a5 + f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f - + https://github.com/dotnet/fsharp - 6d626ff0752a77d339f609b4d361787dc9ca93a5 + f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f - + https://github.com/microsoft/vstest - 68bd10d3aee862a9fbb0bac8b3d474bc323024f3 + a809880e02d8a9986e3ba1daeeeb5078fbb96be5 @@ -141,19 +141,19 @@ linker - + https://github.com/dotnet/roslyn - 52021b4b3a9dcfd7b955102adb2901524a62a371 + f206c5d203c5562f814d3afa3c9e695250391c76 - + https://github.com/dotnet/msbuild - c9eb9dd64e9a2e8a433900a1a626d65a2bce4428 + 797fd829a374a880f63fd4eea4ea6990404c48f4 - + https://github.com/nuget/nuget.client - 078701b97eeef2283c1f4605032b5bcf55a80653 + 9187a50daec29061772a2057490697c6c0e4c354 diff --git a/eng/Versions.props b/eng/Versions.props index 29355872a..287138a80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,14 +7,14 @@ 6 0 - 1 - 02 + 2 + 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - servicing + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release @@ -31,7 +31,7 @@ - 6.0.100 + 6.0.200-preview.21623.5 @@ -56,8 +56,8 @@ - 6.0.101-servicing.21569.16 - 6.0.101-servicing.21569.16 + 6.0.200-preview.22055.23 + 6.0.200-preview.22055.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -113,7 +113,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.100 + 6.0.200-preview.21623.5 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) @@ -150,7 +150,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0 + 17.2.0-preview-20211210-01 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 28648866d..5b00d9b70 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 @@ -49,6 +49,7 @@ jobs: _Container: ${{ parameters.centOS7Container }} _ExcludeOmniSharpTests: true _RunOnline: false + # Offline builds have prebuilts: https://github.com/dotnet/fsharp/issues/12499 ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOS8-Offline: _BootstrapPrep: true diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 0007b6c6e..39f48573d 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100" + "dotnet": "6.0.200-preview.21603.2" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/smoke-test.sh b/src/SourceBuild/tarball/content/smoke-test.sh index a1c43673d..a8f6c2900 100755 --- a/src/SourceBuild/tarball/content/smoke-test.sh +++ b/src/SourceBuild/tarball/content/smoke-test.sh @@ -6,7 +6,7 @@ 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 +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:-} diff --git a/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch new file mode 100644 index 000000000..426502e86 --- /dev/null +++ b/src/SourceBuild/tarball/patches/aspnetcore/0007-WebHost-delegate-nullability.patch @@ -0,0 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Mon, 6 Dec 2021 18:39:25 +0000 +Subject: [PATCH] WebHost delegate nullability + +Addresses the following errors: + + src/Hosting/Hosting/src/Internal/WebHost.cs(83,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). + src/Hosting/Hosting/src/Internal/WebHost.cs(86,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). + src/Hosting/Hosting/src/Internal/WebHost.cs(88,56): error CS8621: Nullability of reference types in return type of 'lambda expression' doesn't match the target delegate 'Func' (possibly because of nullability attributes). + +Cherry-pick of WebHost only changes made under https://github.com/dotnet/aspnetcore/commit/13a460820e90c8f3e90eb4fdbbb3de671389bf0c#diff-6ef451f2ae3e04d73dde362bdf9de6b101aef95e3a4f5190e5c96967d683aef9 +--- + src/Hosting/Hosting/src/Internal/WebHost.cs | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs +index ca52bd1f40..643d03e8af 100644 +--- a/src/Hosting/Hosting/src/Internal/WebHost.cs ++++ b/src/Hosting/Hosting/src/Internal/WebHost.cs +@@ -79,16 +79,14 @@ namespace Microsoft.AspNetCore.Hosting + _hostingServiceProvider = hostingServiceProvider; + _applicationServiceCollection.AddSingleton(); + // There's no way to to register multiple service types per definition. See https://github.com/aspnet/DependencyInjection/issues/360 +-#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. +- _applicationServiceCollection.AddSingleton(services +- => services.GetService() as IHostApplicationLifetime); ++ _applicationServiceCollection.AddSingleton(services ++ => services.GetService()!); + #pragma warning disable CS0618 // Type or member is obsolete +- _applicationServiceCollection.AddSingleton(services +- => services.GetService() as AspNetCore.Hosting.IApplicationLifetime); +- _applicationServiceCollection.AddSingleton(services +- => services.GetService() as Extensions.Hosting.IApplicationLifetime); ++ _applicationServiceCollection.AddSingleton(services ++ => services.GetService()!); ++ _applicationServiceCollection.AddSingleton(services ++ => services.GetService()!); + #pragma warning restore CS0618 // Type or member is obsolete +-#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint. + _applicationServiceCollection.AddSingleton(); + } + diff --git a/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch new file mode 100644 index 000000000..68917950e --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Update-system-command-line-version.patch @@ -0,0 +1,164 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 19 Nov 2021 13:50:52 -0600 +Subject: [PATCH] Update system-command-line version + +Backported with https://github.com/dotnet/format/pull/1436 +--- + eng/Version.Details.xml | 8 ++++---- + eng/Versions.props | 4 ++-- + src/Commands/FormatAnalyzersCommand.cs | 4 ++-- + src/Commands/FormatCommandCommon.cs | 12 ++++++------ + src/Commands/FormatStyleCommand.cs | 4 ++-- + src/Commands/RootFormatCommand.cs | 4 ++-- + 6 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 48b181b..68c0b43 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -5,13 +5,13 @@ + https://github.com/dotnet/roslyn + c7d6f9fab845ffd943216da465022744e7d35f22 + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + +- ++ + https://github.com/dotnet/command-line-api +- 82273cb56c83b589e8e5b63da0ac9745ffc6e105 ++ 09a24a79ef01a0c70655919ee3c59bb54a8574df + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 2758207..6a02917 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -18,8 +18,8 @@ + + 4.0.0-6.21526.21 + +- 2.0.0-beta1.21473.1 +- 0.3.0-alpha.21473.1 ++ 2.0.0-beta1.21525.1 ++ 0.3.0-alpha.21525.1 + + -- true - - - - - - -- -- -- - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch b/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch deleted file mode 100644 index b5b0a84f6..000000000 --- a/src/SourceBuild/tarball/patches/msbuild/0002-Disable-BannedApiAnalyzers-during-source-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Tue, 12 Oct 2021 18:14:59 -0500 -Subject: [PATCH] Disable BannedApiAnalyzers during source-build - -BannedApiAnalyzers has some intentional old dependencies and it's not feasible -to build it during source-build. Remove this usage to remove a prebuilt. -https://github.com/dotnet/msbuild/issues/6961 ---- - eng/Packages.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/Packages.props b/eng/Packages.props -index 0f478634f..3cc09a008 100644 ---- a/eng/Packages.props -+++ b/eng/Packages.props -@@ -45,11 +45,11 @@ - - - -+ - - - - -- - - - diff --git a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch index 6ca89df7d..9a55fed1b 100644 --- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch +++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch @@ -7,26 +7,27 @@ Removes prebuilts. Background Issue: https://github.com/dotnet/source-build/issues/2542 --- - eng/Packages.props | 3 --- + eng/dependabot/Packages.props | 3 --- src/Build/Microsoft.Build.csproj | 4 +++- src/Directory.BeforeCommon.targets | 2 +- + src/Framework/Microsoft.Build.Framework.csproj | 2 +- src/Samples/Directory.Build.props | 1 + src/Tasks/Microsoft.Build.Tasks.csproj | 4 +++- src/Utilities/Microsoft.Build.Utilities.csproj | 2 +- - 6 files changed, 9 insertions(+), 7 deletions(-) + 7 files changed, 10 insertions(+), 8 deletions(-) -diff --git a/eng/Packages.props b/eng/Packages.props -index 2de607c5d..1668addc9 100644 ---- a/eng/Packages.props -+++ b/eng/Packages.props -@@ -46,9 +46,6 @@ +diff --git a/eng/dependabot/Packages.props b/eng/dependabot/Packages.props +index a1f21de26..ff74d6e7f 100644 +--- a/eng/dependabot/Packages.props ++++ b/eng/dependabot/Packages.props +@@ -22,9 +22,6 @@ + - - + - - - - + diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj @@ -34,7 +35,7 @@ index d08e337c5..3b173aee5 100644 --- a/src/Build/Microsoft.Build.csproj +++ b/src/Build/Microsoft.Build.csproj @@ -38,8 +38,10 @@ - + - @@ -58,6 +59,19 @@ index 913c97b12..320bffa56 100644 $(DefineConstants);FEATURE_MSCOREE +diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj +index df7556447..c7edff611 100644 +--- a/src/Framework/Microsoft.Build.Framework.csproj ++++ b/src/Framework/Microsoft.Build.Framework.csproj +@@ -31,7 +31,7 @@ + + + +- ++ + + + diff --git a/src/Samples/Directory.Build.props b/src/Samples/Directory.Build.props index 6b9d6cd9f..317ef14a6 100644 --- a/src/Samples/Directory.Build.props diff --git a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch index 34d37ba0b..36ce5217c 100644 --- a/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch +++ b/src/SourceBuild/tarball/patches/nuget-client/0001-Remove-uneeded-source-build-patches-and-re-patch.patch @@ -69,7 +69,7 @@ index c11557248..0e7dd7861 100644 @@ -33,7 +34,7 @@ - + - diff --git a/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch b/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch new file mode 100644 index 000000000..f48a864fe --- /dev/null +++ b/src/SourceBuild/tarball/patches/nuget-client/0011-Update-System.Threading.Tasks.DataFlow-version.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Tue, 23 Nov 2021 16:13:36 +0000 +Subject: [PATCH] Update System.Threading.Tasks.DataFlow version + +Addresses: +NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] +NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] +NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets] + +Backport issue: https://github.com/dotnet/source-build/issues/2311 +--- + build/packages.targets | 2 +- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build/packages.targets b/build/packages.targets +index a0aa4cc..ef5a1cc 100644 +--- a/build/packages.targets ++++ b/build/packages.targets +@@ -58,7 +59,7 @@ + + + +- ++ + + + diff --git a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch b/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch deleted file mode 100644 index 8e3884438..000000000 --- a/src/SourceBuild/tarball/patches/roslyn/0002-Apply-arcade-powered-source-build-patches-55823.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1a415d2019d74bcf009134326d1c25798589de64 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Tue, 19 Oct 2021 11:39:32 -0500 -Subject: [PATCH] Apply arcade-powered source-build patches (#55823) - -Don't include desktop artifacts that don't exist in source-build. -Source-build doesn't have these artifacts available, even when we eventually will -build desktop TFMs, because Roslyn is one of the first builds in source-build. -Instead Roslyn is picking up reference packages that don't have the `lib` directory -which is causing a build failure. This disables the attempt to grab these desktop -artifacts so source-build just skips them instead. - -Backported to roslyn with https://github.com/dotnet/roslyn/pull/55823 ---- - .../DesktopCompilerArtifacts.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -index c8b87ab6958..107ff051b51 100644 ---- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -+++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets -@@ -20,7 +20,7 @@ - VS training data to the assemblies they produce. - --> - -- -+ - - - --- -2.31.1 - diff --git a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch index f94119820..0afe8be53 100644 --- a/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch +++ b/src/SourceBuild/tarball/patches/roslyn/0004-Disable-apphost-build-of-csi-vbi-for-source-build.patch @@ -22,7 +22,7 @@ index 3970bb4e9ea..e96beb550d2 100644 @@ -6,6 +6,7 @@ Exe CSharpInteractive - netcoreapp3.1;net472 + net6.0;net472 + false @@ -34,7 +34,7 @@ index 5bbdf7f03a7..5f732d71534 100644 @@ -6,6 +6,7 @@ Exe Sub Main - netcoreapp3.1;net472 + net6.0;net472 + false diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch b/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch deleted file mode 100644 index aa1e198cc..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 752ab8ab199bd1d99353658cb676a6612508333b Mon Sep 17 00:00:00 2001 -From: Michael Simons -Date: Wed, 8 Sep 2021 21:31:01 +0000 -Subject: [PATCH] Drop vstest.console netcoreapp2.1 support - -Workaround for https://github.com/microsoft/vstest/issues/3044 ---- - src/vstest.console/vstest.console.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj -index 1343e6d9..7c555591 100644 ---- a/src/vstest.console/vstest.console.csproj -+++ b/src/vstest.console/vstest.console.csproj -@@ -8,7 +8,7 @@ - - vstest.console - netcoreapp2.1;net451 -- netcoreapp2.1;net6.0 -+ net6.0 - true - Exe - false --- -2.29.2 - diff --git a/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch new file mode 100644 index 000000000..729c76c4e --- /dev/null +++ b/src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Tue, 23 Nov 2021 17:45:25 +0000 +Subject: [PATCH] Update nuspec project target frameworks for source-build + +This patch removes prebuilts caused from targetting netcoreapp1.0 + +Backported with https://github.com/microsoft/vstest/pull/3188 +--- + src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++- + src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj +index 038fbf8..57cde8e 100644 +--- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj ++++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj +@@ -1,7 +1,8 @@ + + + Exe +- netcoreapp1.0 ++ netcoreapp1.0 ++ net6.0 + false + TestPlatform.Build.nuspec + version=$(Version) +diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj +index 29198ba..19386eb 100644 +--- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj ++++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj +@@ -1,7 +1,8 @@ + + + Exe +- netcoreapp1.0 ++ netcoreapp1.0 ++ net6.0 + false + TestPlatform.CLI.nuspec + version=$(Version) diff --git a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch b/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch deleted file mode 100644 index bd4c13409..000000000 --- a/src/SourceBuild/tarball/patches/vstest/0002-Don-t-publish-for-win-runtime-identifier-in-source-b.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 071dfef93e5431a415bd9298f2ed8aaf9a22524f Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Mon, 11 Oct 2021 19:35:15 +0000 -Subject: [PATCH] Don't publish for win runtime identifier in source-build - -See https://github.com/microsoft/vstest/pull/3096 ---- - src/testhost.x86/testhost.x86.csproj | 2 +- - src/testhost/testhost.csproj | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj -index 7eb5cd15..09856522 100644 ---- a/src/testhost.x86/testhost.x86.csproj -+++ b/src/testhost.x86/testhost.x86.csproj -@@ -19,7 +19,7 @@ - app.manifest - - -- win7-x86 -+ win7-x86 - false - $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 - -diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj -index a780e4e9..ba0fd259 100644 ---- a/src/testhost/testhost.csproj -+++ b/src/testhost/testhost.csproj -@@ -16,7 +16,7 @@ - app.manifest - - -- win7-x64 -+ win7-x64 - false - $(AssemblyName).$(TargetFramework) - --- -2.31.1 - diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index e7779dd08..425337024 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -370,6 +370,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" + RuntimePackExcludedRuntimeIdentifiers="android" /> + - + + + + diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 5133c3a38..01f704c7d 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -28,6 +28,8 @@ '$(Rid)' == 'linux-musl-x64' ">$(Rid) $(OSName)-$(Architecture) + $(HostOSName)-$(Architecture) + dotnet-sdk-internal$(PgoTerm) dotnet-sdk$(PgoTerm) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.thm b/src/redist/targets/packaging/windows/clisdk/bundle.thm index 89cf63055..ebe591ccc 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.thm +++ b/src/redist/targets/packaging/windows/clisdk/bundle.thm @@ -40,8 +40,8 @@ #(loc.FilesInUseLabel) - - + +