Merge pull request #571 from jnm2/fix_acceptance_tests_for_15.9

Fix acceptance tests for 15.9
nunit · Nov 22, 2018 · e343ac4 · e343ac4
2 parents af8f97b + de7b8ee
commit e343ac4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/acceptance.cake b/acceptance.cake
@@ -14,9 +14,9 @@ Task("Acceptance")
 
         using (var tempDirectory = new TempDirectory())
         {
-            BuildAndVerifySinglePassingTest("Simple", "net35", "netcoreapp1.0");
-            BuildAndVerifySinglePassingTest("Referencing Mono.Cecil", "net35", "netcoreapp1.0");
-            BuildAndVerifySinglePassingTest("Referencing Mono.Cecil 0.10.0", "net35", "netcoreapp1.0");
+            BuildAndVerifySinglePassingTest("Simple", "net45", "netcoreapp1.0");
+            BuildAndVerifySinglePassingTest("Referencing Mono.Cecil", "net45", "netcoreapp1.0");
+            BuildAndVerifySinglePassingTest("Referencing Mono.Cecil 0.10.0", "net45", "netcoreapp1.0");
 
             void BuildAndVerifySinglePassingTest(string projectName, params string[] targetFrameworks)
             {

diff --git a/tests/Referencing Mono.Cecil 0.10.0/Referencing Mono.Cecil 0.10.0.csproj b/tests/Referencing Mono.Cecil 0.10.0/Referencing Mono.Cecil 0.10.0.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp1.0</TargetFrameworks>
     <RootNamespace>Referencing_Mono_Cecil_0_10_0</RootNamespace>
   </PropertyGroup>
 
@@ -12,11 +12,11 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net35'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="nunit.engine.api" Version="3.7.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="*" />
     <PackageReference Include="nunit.engine.netstandard" Version="3.7.0" />
   </ItemGroup>

diff --git a/tests/Referencing Mono.Cecil/Referencing Mono.Cecil.csproj b/tests/Referencing Mono.Cecil/Referencing Mono.Cecil.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp1.0</TargetFrameworks>
     <RootNamespace>Referencing_Mono_Cecil</RootNamespace>
   </PropertyGroup>
 
@@ -12,7 +12,7 @@
     <PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="*" />
   </ItemGroup>
 

diff --git a/tests/Simple/Simple.csproj b/tests/Simple/Simple.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net35;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp1.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>