Skip to content

Commit 8853017

Browse files
MichaelSimonsMichaelSimons
committed
.NET 5 vstest patch
1 parent 9f815c3 commit 8853017

File tree

1 file changed

+123
-0
lines changed

1 file changed

+123
-0
lines changed

‎patches/vstest/0008-build-for-.NET-5.patch

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
From e6f8be2661fa4684dd658eaf7b62f734fe85aa10 Mon Sep 17 00:00:00 2001
2+
From: Michael Simons <[email protected]>
3+
Date: Fri, 2 Apr 2021 17:11:31 +0000
4+
Subject: [PATCH] build for .NET 5
5+
6+
---
7+
scripts/build/TestPlatform.targets | 2 ++
8+
src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj | 2 +-
9+
.../Microsoft.TestPlatform.CommunicationUtilities.csproj | 2 +-
10+
.../Microsoft.TestPlatform.CoreUtilities.csproj | 2 +-
11+
src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs | 2 +-
12+
.../Microsoft.TestPlatform.CrossPlatEngine.csproj | 2 +-
13+
.../Microsoft.TestPlatform.ObjectModel.csproj | 2 +-
14+
.../Microsoft.TestPlatform.Utilities.csproj | 2 +-
15+
8 files changed, 9 insertions(+), 7 deletions(-)
16+
17+
diff --git a/scripts/build/TestPlatform.targets b/scripts/build/TestPlatform.targets
18+
index 6a3e102..44ebc82 100644
19+
--- a/scripts/build/TestPlatform.targets
20+
+++ b/scripts/build/TestPlatform.targets
21+
@@ -2,6 +2,8 @@
22+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23+
<PropertyGroup>
24+
<TestPlatformRoot Condition="$(TestPlatformRoot) == ''">$(MSBuildThisFileDirectory)..\..\</TestPlatformRoot>
25+
+
26+
+ <NoWarn>$(NoWarn);CA1416</NoWarn>
27+
</PropertyGroup>
28+
29+
<!-- Static analysis dependencies -->
30+
diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
31+
index 3b73444..d99d47f 100644
32+
--- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
33+
+++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
34+
@@ -7,7 +7,7 @@
35+
<PropertyGroup>
36+
<AssemblyName>Microsoft.VisualStudio.TestPlatform.Common</AssemblyName>
37+
<TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
38+
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netstandard1.3</TargetFrameworks>
39+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;net5.0</TargetFrameworks>
40+
<WarningsAsErrors>true</WarningsAsErrors>
41+
</PropertyGroup>
42+
<ItemGroup>
43+
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
44+
index 8419b36..0eb30c6 100644
45+
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
46+
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj
47+
@@ -6,7 +6,7 @@
48+
<PropertyGroup>
49+
<AssemblyName>Microsoft.TestPlatform.CommunicationUtilities</AssemblyName>
50+
<TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
51+
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netstandard1.3</TargetFrameworks>
52+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;net5.0</TargetFrameworks>
53+
<WarningsAsErrors>true</WarningsAsErrors>
54+
<EnableCodeAnalysis>true</EnableCodeAnalysis>
55+
</PropertyGroup>
56+
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
57+
index 9ab8e59..026ddde 100644
58+
--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
59+
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
60+
@@ -8,7 +8,7 @@
61+
<AssemblyName>Microsoft.TestPlatform.CoreUtilities</AssemblyName>
62+
<TargetFrameworks>netstandard2.0;netstandard1.3;net451;net45</TargetFrameworks>
63+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);uap10.0;netstandard1.0</TargetFrameworks>
64+
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netstandard1.3;netstandard1.0</TargetFrameworks>
65+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;net5.0</TargetFrameworks>
66+
</PropertyGroup>
67+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
68+
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
69+
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
70+
index fb226a5..59b4247 100644
71+
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
72+
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
73+
@@ -50,7 +50,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
74+
75+
#endif
76+
77+
-#if NETSTANDARD
78+
+#if NETSTANDARD || NET
79+
public static PlatformTraceLevel TraceLevel
80+
{
81+
get
82+
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
83+
index 72e7d1f..77a7a2d 100644
84+
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
85+
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
86+
@@ -7,7 +7,7 @@
87+
<PropertyGroup>
88+
<AssemblyName>Microsoft.TestPlatform.CrossPlatEngine</AssemblyName>
89+
<TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
90+
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netstandard1.3</TargetFrameworks>
91+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;net5.0</TargetFrameworks>
92+
<WarningsAsErrors>true</WarningsAsErrors>
93+
<!--<EnableCodeAnalysis>true</EnableCodeAnalysis>-->
94+
</PropertyGroup>
95+
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
96+
index ac7507c..f341424 100644
97+
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
98+
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
99+
@@ -8,7 +8,7 @@
100+
<AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName>
101+
<TargetFrameworks>net45;net451;netstandard2.0;netstandard1.3</TargetFrameworks>
102+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);uap10.0;netstandard1.0</TargetFrameworks>
103+
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netstandard1.3;netstandard1.0</TargetFrameworks>
104+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;net5.0</TargetFrameworks>
105+
<PackageId>Microsoft.TestPlatform.ObjectModel</PackageId>
106+
</PropertyGroup>
107+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
108+
diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
109+
index 7d14164..9787273 100644
110+
--- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
111+
+++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj
112+
@@ -7,7 +7,7 @@
113+
<PropertyGroup>
114+
<AssemblyName>Microsoft.TestPlatform.Utilities</AssemblyName>
115+
<TargetFrameworks>netstandard2.0;netstandard1.3;net451</TargetFrameworks>
116+
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netstandard1.3</TargetFrameworks>
117+
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;net5.0</TargetFrameworks>
118+
</PropertyGroup>
119+
<ItemGroup>
120+
<EmbeddedResource Include="Resources\Resources.resx" />
121+
--
122+
1.8.3.1
123+

0 commit comments

Comments
 (0)