Build and test the portable-net40 target with the new project system

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

Hide file tree

Showing 11 changed files with 36 additions and 440 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,7 +10,7 @@ build_script:
 test_script:
 - vstest.console /logger:Appveyor /TestCaseFilter:"TestCategory=runtime-suite" "C:\projects\antlr4cs\runtime\CSharp\Antlr4.Runtime.Test\bin\%CONFIGURATION%\net45\Antlr4.Runtime.Test.dll"
 - 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\portable-net40\%CONFIGURATION%\Antlr4.Runtime.Test.portable_net40.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\net30\%CONFIGURATION%\Antlr4.Runtime.Test.net30.dll"

diff --git a/build/Antlr4.Runtime.nuspec b/build/Antlr4.Runtime.nuspec
@@ -56,9 +56,9 @@
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\net35-cf\Antlr4.Runtime.pdb" target="lib\net35-cf"/>
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\net35-cf\Antlr4.Runtime.xml" target="lib\net35-cf"/>
 
-    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\portable-net40\$Configuration$\Antlr4.Runtime.dll" target="lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"/>
-    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\portable-net40\$Configuration$\Antlr4.Runtime.pdb" target="lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"/>
-    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\portable-net40\$Configuration$\Antlr4.Runtime.xml" target="lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"/>
+    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\portable40-net40+sl5+win8+wp8+wpa81\Antlr4.Runtime.dll" target="lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"/>
+    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\portable40-net40+sl5+win8+wp8+wpa81\Antlr4.Runtime.pdb" target="lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"/>
+    <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\portable40-net40+sl5+win8+wp8+wpa81\Antlr4.Runtime.xml" target="lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1"/>
 
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\netstandard1.1\Antlr4.Runtime.dll" target="lib\netstandard1.1"/>
     <file src="..\runtime\CSharp\Antlr4.Runtime\bin\$Configuration$\netstandard1.1\Antlr4.Runtime.pdb" target="lib\netstandard1.1"/>

diff --git a/build/build.ps1 b/build/build.ps1
@@ -158,6 +158,8 @@ if (-not $SkipKeyCheck) {
 			$assembly = Resolve-FullPath -Path "..\runtime\CSharp\Antlr4.Runtime\bin\$BuildConfig\$($pair.Key)\Antlr4.Runtime.dll"
 		} elseif ($pair.Key -eq 'net45') {
 			$assembly = Resolve-FullPath -Path "..\runtime\CSharp\Antlr4.Runtime\bin\$BuildConfig\$($pair.Key)\Antlr4.Runtime.dll"
+		} elseif ($pair.Key -eq 'portable40-net40+sl5+win8+wp8+wpa81') {
+			$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-cf') {

diff --git a/build/keys.ps1 b/build/keys.ps1
@@ -10,7 +10,7 @@ If ($AntlrVersion.Contains('-')) {
 		'net35-client' = 'e9931a4108ef2354'
 		'net40-client' = 'e9931a4108ef2354'
 		'net45' = 'e9931a4108ef2354'
-		'portable-net40' = 'e9931a4108ef2354'
+		'portable40-net40+sl5+win8+wp8+wpa81' = 'e9931a4108ef2354'
 		'netstandard1.1' = 'e9931a4108ef2354'
 	}
 
@@ -24,7 +24,7 @@ If ($AntlrVersion.Contains('-')) {
 		'net35-client' = '09abb75b9ed49849'
 		'net40-client' = '09abb75b9ed49849'
 		'net45' = '09abb75b9ed49849'
-		'portable-net40' = '09abb75b9ed49849'
+		'portable40-net40+sl5+win8+wp8+wpa81' = '09abb75b9ed49849'
 		'netstandard1.1' = '09abb75b9ed49849'
 	}
 

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>net40;net45;net452</TargetFrameworks>
+    <TargetFrameworks>portable40-net40+sl5+win8+wp8+wpa81;net40;net45;net452</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 
@@ -23,6 +23,20 @@
   </PropertyGroup>
 
   <Choose>
+    <When Condition="'$(TargetFramework)' == 'portable40-net40+sl5+win8+wp8+wpa81'">
+      <PropertyGroup>
+        <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+        <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+        <TargetFrameworkProfile />
+        <DefineConstants>$(DefineConstants);PORTABLE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
+        <MSTest2>False</MSTest2>
+      </PropertyGroup>
+      <ItemGroup>
+        <ProjectReference Include="..\Antlr4.Runtime\Antlr4.Runtime.csproj">
+          <SetTargetFramework>TargetFramework=portable40-net40+sl5+win8+wp8+wpa81</SetTargetFramework>
+        </ProjectReference>
+      </ItemGroup>
+    </When>
     <When Condition="'$(TargetFramework)' == 'net40'">
       <PropertyGroup>
         <DefineConstants>$(DefineConstants);NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>

diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.portable-net40.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.portable-net40.csproj
diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.portable-net40.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.portable-net40.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;net40-client;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.1;net35-cf;portable40-net40+sl5+win8+wp8+wpa81;net40-client;net45</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
 
     <AssemblyVersion>4.6.0.0</AssemblyVersion>
@@ -75,6 +75,18 @@
         </Reference>
       </ItemGroup>
     </When>
+    <When Condition="'$(TargetFramework)' == 'portable40-net40+sl5+win8+wp8+wpa81'">
+      <PropertyGroup>
+        <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
+        <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+        <TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
+        <DefineConstants>$(DefineConstants);PORTABLE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS</DefineConstants>
+      </PropertyGroup>
+      <ItemGroup>
+        <Reference Include="System" />
+        <Reference Include="System.Core" />
+      </ItemGroup>
+    </When>
     <When Condition="'$(TargetFramework)' == 'net40-client'">
       <PropertyGroup>
         <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>