4de9a98981
* Update dependencies from https://github.com/dotnet/sdk build 20211118.19 (#12715) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211121.3 (#12720) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211122.10 (#12721) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211123.1 (#12723) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211123.2 (#12724) [release/6.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (parent: Microsoft.NET.Sdk) * Update dependencies from https://github.com/dotnet/sdk build 20211123.4 (#12726) [release/6.0.2xx] Update dependencies from dotnet/sdk * source-build patches needed to get 6.0.2xx building (#12718) * source-build patches needed to get 6.0.2xx building * Patch to address msbuild prebuilts * Remove conflicting backported patch * Additional patches * Additional vstest patch * Workaround dev-cert issue in smoke-tests Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Simons <msimons@microsoft.com> Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
41 lines
2.1 KiB
Diff
41 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MichaelSimons <msimons@microsoft.com>
|
|
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 @@
|
|
<Project Sdk="Microsoft.NET.Sdk">
|
|
<PropertyGroup>
|
|
<OutputType>Exe</OutputType>
|
|
- <TargetFramework>netcoreapp1.0</TargetFramework>
|
|
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
|
|
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
|
|
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
|
<NuspecFile>TestPlatform.Build.nuspec</NuspecFile>
|
|
<NuspecProperties>version=$(Version)</NuspecProperties>
|
|
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 @@
|
|
<Project Sdk="Microsoft.NET.Sdk">
|
|
<PropertyGroup>
|
|
<OutputType>Exe</OutputType>
|
|
- <TargetFramework>netcoreapp1.0</TargetFramework>
|
|
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
|
|
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
|
|
<CheckEolTargetFramework>false</CheckEolTargetFramework>
|
|
<NuspecFile>TestPlatform.CLI.nuspec</NuspecFile>
|
|
<NuspecProperties>version=$(Version)</NuspecProperties>
|