Build and test the net35-client target with the new project system

sharwell · Jul 16, 2017 · 8dc2c10 · 8dc2c10
1 parent 88a8194
commit 8dc2c10
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 445 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,7 +12,7 @@ test_script:
 - vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\%CONFIGURATION%\net452\Antlr4.Runtime.Test.dll"
 - vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\%CONFIGURATION%\portable40-net40+sl5+win8+wp8+wpa81\Antlr4.Runtime.Test.dll"
 - vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\%CONFIGURATION%\net40\Antlr4.Runtime.Test.dll"
-- vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\net35\%CONFIGURATION%\Antlr4.Runtime.Test.net35_client.dll"
+- vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\%CONFIGURATION%\net35\Antlr4.Runtime.Test.dll"
 - vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\net30\%CONFIGURATION%\Antlr4.Runtime.Test.net30.dll"
 - vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\net20\%CONFIGURATION%\Antlr4.Runtime.Test.net20.dll"
 cache:

diff --git a/build/Antlr4.Runtime.nuspec b/build/Antlr4.Runtime.nuspec
@@ -40,9 +40,9 @@
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\net30\$Configuration$\Antlr4.Runtime.pdb" target="lib\net30"/>
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\net30\$Configuration$\Antlr4.Runtime.xml" target="lib\net30"/>
 
-    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-client\$Configuration$\Antlr4.Runtime.dll" target="lib\net35-client"/>
-    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-client\$Configuration$\Antlr4.Runtime.pdb" target="lib\net35-client"/>
-    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\net35-client\$Configuration$\Antlr4.Runtime.xml" target="lib\net35-client"/>
+    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\net35-client\Antlr4.Runtime.dll" target="lib\net35-client"/>
+    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\net35-client\Antlr4.Runtime.pdb" target="lib\net35-client"/>
+    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\net35-client\Antlr4.Runtime.xml" target="lib\net35-client"/>
 
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\net40-client\Antlr4.Runtime.dll" target="lib\net40-client"/>
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\net40-client\Antlr4.Runtime.pdb" target="lib\net40-client"/>

diff --git a/build/build.ps1 b/build/build.ps1
@@ -162,6 +162,8 @@ if (-not $SkipKeyCheck) {
 			$assembly = Resolve-FullPath -Path "..\runtime\CSharp\Antlr4.Runtime\bin\$BuildConfig\$($pair.Key)\Antlr4.Runtime.dll"
 		} elseif ($pair.Key -eq 'net40-client') {
 			$assembly = Resolve-FullPath -Path "..\runtime\CSharp\Antlr4.Runtime\bin\$BuildConfig\$($pair.Key)\Antlr4.Runtime.dll"
+		} elseif ($pair.Key -eq 'net35-client') {
+			$assembly = Resolve-FullPath -Path "..\runtime\CSharp\Antlr4.Runtime\bin\$BuildConfig\$($pair.Key)\Antlr4.Runtime.dll"
 		} elseif ($pair.Key -eq 'net35-cf') {
 			$assembly = Resolve-FullPath -Path "..\runtime\CSharp\Antlr4.Runtime\bin\$BuildConfig\$($pair.Key)\Antlr4.Runtime.dll"
 		} else {

diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <!-- Note: net452 is used for testing the netstandard1.1 target. -->
-    <TargetFrameworks>portable40-net40+sl5+win8+wp8+wpa81;net40;net45;net452</TargetFrameworks>
+    <TargetFrameworks>net35;portable40-net40+sl5+win8+wp8+wpa81;net40;net45;net452</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 
@@ -23,6 +23,18 @@
   </PropertyGroup>
 
   <Choose>
+    <When Condition="'$(TargetFramework)' == 'net35'">
+      <PropertyGroup>
+        <DefineConstants>$(DefineConstants);NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
+        <MSTest2>False</MSTest2>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.csproj">
+          <SetTargetFramework>TargetFramework=net35-client</SetTargetFramework>
+        </ProjectReference>
+      </ItemGroup>
+    </When>
     <When Condition="'$(TargetFramework)' == 'portable40-net40+sl5+win8+wp8+wpa81'">
       <PropertyGroup>
         <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>

diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net35-client.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net35-client.csproj
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/TaskSchedulers/QueuedTaskScheduler.cs b/runtime/CSharp/Antlr4.Runtime.Test/TaskSchedulers/QueuedTaskScheduler.cs
@@ -1,4 +1,6 @@
-//--------------------------------------------------------------------------
+#if NET40PLUS
+
+//--------------------------------------------------------------------------
 // 
 //  Copyright (c) Microsoft Corporation.  All rights reserved. 
 // 
@@ -609,4 +611,6 @@ public void Dispose()
             }
         }
     }
-}
+}
+
+#endif
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net35-client.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net35-client.config
diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.1;net35-cf;portable40-net40+sl5+win8+wp8+wpa81;net40-client;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;net35-cf;net35-client;portable40-net40+sl5+win8+wp8+wpa81;net40-client;net45</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
 
     <AssemblyVersion>4.6.0.0</AssemblyVersion>
@@ -75,6 +75,14 @@
         </Reference>
       </ItemGroup>
     </When>
+    <When Condition="'$(TargetFramework)' == 'net35-client'">
+      <PropertyGroup>
+        <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+        <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+        <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+        <DefineConstants>$(DefineConstants);NET35;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
+      </PropertyGroup>
+    </When>
     <When Condition="'$(TargetFramework)' == 'portable40-net40+sl5+win8+wp8+wpa81'">
       <PropertyGroup>
         <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>