mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removed backported vstest source-build patch

Browse source
This commit is contained in:
MichaelSimons 2022-04-06 21:52:48 +00:00
parent 3bdac4d837
commit d277a44e4c
1 changed files with 0 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch
View file

@ -1,41 +0,0 @@
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>