Update test matrix to include .NET Standard 2.0 testing (#638)

twsouthwick · web-flow · commit e12e47630332 · 2019-11-19T10:42:55.000-08:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,6 +12,7 @@
          - DevFramework46: .NET Framework 4.6
          - DevCore11:      .NET Core 1.1
          - DevCore21:      .NET Core 2.1
+         - DevCore30:      .NET Core 3.0
          - All: Will build for all platforms
          -->
     <ProjectLoadStyle Condition=" '$(ProjectLoadStyle)' == '' ">DevCore21</ProjectLoadStyle>
@@ -32,6 +33,7 @@
         <AssetsTargetFrameworks>net452</AssetsTargetFrameworks>
         <!-- BenchmarkDotNet only supports .NET Standard 2.0-->
         <BenchmarkTargetFrameworks>net461</BenchmarkTargetFrameworks>
+        <SamplesFrameworks>net46</SamplesFrameworks>
       </PropertyGroup>
     </When>
     <When Condition=" '$(ProjectLoadStyle)' == 'DevFramework46' ">
@@ -40,6 +42,7 @@
         <TestTargetFrameworks>net46</TestTargetFrameworks>
         <AssetsTargetFrameworks>net452</AssetsTargetFrameworks>
         <BenchmarkTargetFrameworks>net461</BenchmarkTargetFrameworks>
+        <SamplesFrameworks>net46</SamplesFrameworks>
       </PropertyGroup>
     </When>
     <When Condition=" '$(ProjectLoadStyle)' == 'DevCore11' ">
@@ -49,6 +52,7 @@
         <AssetsTargetFrameworks>netstandard1.3</AssetsTargetFrameworks>
         <!-- BenchmarkDotNet only supports .NET Standard 2.0-->
         <BenchmarkTargetFrameworks>netcoreapp2.1</BenchmarkTargetFrameworks>
+        <SamplesFrameworks>netcoreapp1.1</SamplesFrameworks>
       </PropertyGroup>
     </When>
     <When Condition=" '$(ProjectLoadStyle)' == 'DevCore21' ">
@@ -57,6 +61,16 @@
         <TestTargetFrameworks>netcoreapp2.1</TestTargetFrameworks>
         <AssetsTargetFrameworks>netstandard1.3</AssetsTargetFrameworks>
         <BenchmarkTargetFrameworks>netcoreapp2.1</BenchmarkTargetFrameworks>
+        <SamplesFrameworks>netcoreapp2.1</SamplesFrameworks>
+      </PropertyGroup>
+    </When>
+    <When Condition=" '$(ProjectLoadStyle)' == 'DevCore30' ">
+      <PropertyGroup>
+        <ProductTargetFrameworks>netstandard2.0</ProductTargetFrameworks>
+        <TestTargetFrameworks>netcoreapp3.0</TestTargetFrameworks>
+        <AssetsTargetFrameworks>netstandard1.3</AssetsTargetFrameworks>
+        <BenchmarkTargetFrameworks>netcoreapp3.0</BenchmarkTargetFrameworks>
+        <SamplesFrameworks>netcoreapp3.0</SamplesFrameworks>
       </PropertyGroup>
     </When>
     <When Condition=" '$(ProjectLoadStyle)' == 'All' ">
@@ -67,8 +81,9 @@
         -->
         <ProductTargetFrameworks>netstandard1.3;netstandard2.0;net35;net40;net46</ProductTargetFrameworks>
         <AssetsTargetFrameworks>net452;netstandard1.3</AssetsTargetFrameworks>
-        <TestTargetFrameworks>net452;net46;netcoreapp1.1;netcoreapp2.1</TestTargetFrameworks>
-        <BenchmarkTargetFrameworks>net461;netcoreapp2.1</BenchmarkTargetFrameworks>
+        <TestTargetFrameworks>net452;net46;netcoreapp1.1;netcoreapp2.1;netcoreapp3.0</TestTargetFrameworks>
+        <BenchmarkTargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</BenchmarkTargetFrameworks>
+        <SamplesFrameworks>net46;netcoreapp2.1;netcoreapp3.0</SamplesFrameworks>
 
         <!-- Must disable this due to https://github.com/NuGet/Home/issues/7414 so .NET Core 1.x will build -->
         <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
diff --git a/README.md b/README.md
@@ -70,12 +70,13 @@ WindowsBase or System.IO.Packaging
 
 There is a known issue in `WindowsBase` that causes crashes when handling large data sources. This is fixed in later versions of the library, based on the platform availability of the `System.IO.Packaging` package. When possible, we use this package instead of `WindowsBase`. This not only fixes the crash seen by some users, but is available cross platform. However, it is only available on .NET Standard 1.3+ and .NET Framework 4.6+. For this reason, the NuGet package has multiple targets to bring in, when possible. The targets are determined by NuGet at installation and build time and are listed in the table below.
 
-| Platform      | System.IO.Packing Source | Tested by     |
-| --------      | ------------------------ | ------------- |
-| .NET 3.5      | WindowsBase              | N/A           |
-| .NET 4.0      | WindowsBase              | .NET 4.5.2    |
-| .NET 4.6      | NuGet                    | .NET 4.6      |
-| .NET Standard | NuGet                    | .NET Core 1.0 |
+| Platform          | System.IO.Packing Source | Tested by                    |
+| ----------------- | ------------------------ | ---------------------------- |
+| .NET 3.5          | WindowsBase              | N/A                          |
+| .NET 4.0          | WindowsBase              | .NET 4.5.2                   |
+| .NET 4.6          | NuGet                    | .NET 4.6                     |
+| .NET Standard 1.3 | NuGet                    | .NET Core 1.1                |
+| .NET Standard 2.0 | NuGet                    | .NET Core 2.1, .NET Core 3.0 |
 
 Keep in mind, though, that the `System.IO.Packaging` on .NET 4.6+ is simply a facade over WindowsBase, and thus everything running on .NET 4.6 will use WindowsBase instead of the newer implementation.
 
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -31,6 +31,8 @@ stages:
             name: net461
           - tfm: netcoreapp2.1
             name: netcoreapp2_1
+          - tfm: netcoreapp3.0
+            name: netcoreapp3_0
     dependsOn: Build
     condition: succeeded()
 
@@ -45,8 +47,11 @@ stages:
             name: net46
           - tfm: netcoreapp1.1
             name: netcoreapp1_1
+            runtime: '1.1.14'
           - tfm: netcoreapp2.1
             name: netcoreapp2_1
+          - tfm: netcoreapp3.0
+            name: netcoreapp3_0
     dependsOn: Build
     condition: succeeded()
 
diff --git a/build/build.yml b/build/build.yml
@@ -4,12 +4,13 @@ steps:
     inputs:
       packageType: 'sdk'
       useGlobalJson: true
+
   - task: PowerShell@2
     displayName: 'Update version'
     inputs:
       targetType: 'inline'
       script: |
-        dotnet tool install --global GitVersion.Tool --version 5.0.1        
+        dotnet tool install --global GitVersion.Tool --version 5.1.2      
         dotnet gitversion /output buildserver /nofetch
 
   - task: VSBuild@1
diff --git a/build/test.yml b/build/test.yml
@@ -10,6 +10,12 @@ jobs:
     steps:
       - checkout: none
 
+      - ${{ if framework.runtime }}:
+        - task: UseDotNet@2
+          displayName: 'Install SDK'
+          inputs:
+            version: '${{ framework.runtime }}'
+
       - download: current
         artifact: build
         patterns: '*.Tests/${{ framework.tfm }}/publish/**/*'
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.801"
+    "version": "3.0.100"
   }
 }
diff --git a/samples/IsolatedStorageExceptionWorkaround/IsolatedStorageExceptionWorkaround.csproj b/samples/IsolatedStorageExceptionWorkaround/IsolatedStorageExceptionWorkaround.csproj
@@ -2,13 +2,26 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFrameworks>$(SamplesFrameworks)</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <NoWarn>$(NoWarn);CA1303</NoWarn>
   </PropertyGroup>
 
+  <Choose>
+    <When Condition=" '$(TargetFramework)' == 'net46' ">
+      <ItemGroup>
+        <Compile Remove="Program.Empty.cs" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup >
+        <Compile Remove="Program.cs" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.9.1" />
   </ItemGroup>
 
-
 </Project>
diff --git a/samples/IsolatedStorageExceptionWorkaround/Program.Empty.cs b/samples/IsolatedStorageExceptionWorkaround/Program.Empty.cs
@@ -0,0 +1,15 @@
+﻿// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace IsolatedStorageExceptionWorkaround
+{
+    internal class Program
+    {
+        private static void Main()
+        {
+            Console.WriteLine("Sample only applicable on .NET Framework");
+        }
+    }
+}
diff --git a/test/DocumentFormat.OpenXml.Tests/ofapiTest/OpenXmlValidatorTest.cs b/test/DocumentFormat.OpenXml.Tests/ofapiTest/OpenXmlValidatorTest.cs
@@ -1033,6 +1033,7 @@ public void FloatAttributeValidationTest()
             Assert.Equal("Sch_AttributeValueDataTypeDetailed", actual.First().Id);
             Assert.Equal("The attribute 'val' has invalid value 'abc'. The string 'abc' is not a valid 'Single' value.", actual.First().Description);
 
+#if !NETCOREAPP3_0
             // float overflow
             element.Val.InnerText = "-3.402823e39";
             actual = O12Validator.Validate(element);
@@ -1048,6 +1049,7 @@ public void FloatAttributeValidationTest()
             Assert.Equal(ValidationErrorType.Schema, actual.First().ErrorType);
             Assert.Equal("Sch_AttributeValueDataTypeDetailed", actual.First().Id);
             Assert.Equal("The attribute 'val' has invalid value '3.402823e39'. The string '3.402823e39' is not a valid 'Single' value.", actual.First().Description);
+#endif
         }
 
         /// <summary>
@@ -1096,6 +1098,7 @@ public void DoubleAttributeValidationTest()
             Assert.Equal("Sch_AttributeValueDataTypeDetailed", actual.First().Id);
             Assert.Equal("The attribute 'val' has invalid value 'abc'. The string 'abc' is not a valid 'Double' value.", actual.First().Description);
 
+#if !NETCOREAPP3_0 // Fails due to https://github.com/dotnet/coreclr/issues/27898
             // double overflow
             element.Val.InnerText = "-1.79769313486232e309";
             actual = O12Validator.Validate(element);
@@ -1111,6 +1114,7 @@ public void DoubleAttributeValidationTest()
             Assert.Equal(ValidationErrorType.Schema, actual.First().ErrorType);
             Assert.Equal("Sch_AttributeValueDataTypeDetailed", actual.First().Id);
             Assert.Equal("The attribute 'val' has invalid value '1.79769313486232e309'. The string '1.79769313486232e309' is not a valid 'Double' value.", actual.First().Description);
+#endif
 
             element.Val = 0;
             actual = O12Validator.Validate(element);
@@ -2796,9 +2800,9 @@ public void TrueFalseBlankValueValidationTest2()
             Assert.Equal("The attribute 'invx' has invalid value 'F'. The Enumeration constraint failed.", actual.First().Description);
         }
 
-        #endregion
+#endregion
 
-        #region unit test with test file data
+#region unit test with test file data
 
         /// <summary>
         ///A test for Validate(Stream) - validating Spreadsheet package.
@@ -3207,9 +3211,9 @@ public void MaxErrorsTest()
             }
         }
 
-        #endregion
+#endregion
 
-        #region new test regarding O14 support
+#region new test regarding O14 support
 
         /// <summary>
         /// A test for the newly added element.
@@ -3776,7 +3780,7 @@ public void NamespaceTest()
             Assert.Empty(actual);
         }
 
-        #endregion
+#endregion
 
         /// <summary>
         ///A test for Validate(OpenXmlPackage) - validating a document opened with a different version.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "2.1.801"`
	`3`	`+ "version": "3.0.100"`
`4`	`4`	`}`
`5`	`5`	`}`