Added NUnitLite and MockAssembly .NET Standard Projects

nunit · Nov 4, 2016 · c598485 · c598485
1 parent f16e544
commit c598485
Show file tree

Hide file tree

Showing 30 changed files with 298 additions and 8 deletions.
diff --git a/nunit.sln b/nunit.sln
@@ -131,6 +131,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetStandard", "NetStandard"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework-netstandard", "src\NUnitFramework\framework\nunit.framework-netstandard.csproj", "{FCF07E6C-335D-4265-B529-B7AF0E1076AB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunitlite-netstandard", "src\NUnitFramework\nunitlite\nunitlite-netstandard.csproj", "{C28BC2BD-2D6A-4524-996E-45BA87B65B9F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mock-assembly-netstandard", "src\NUnitFramework\mock-assembly\mock-assembly-netstandard.csproj", "{06EB9559-89AE-487A-B80B-C4816B50A592}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -301,6 +305,14 @@ Global
 		{FCF07E6C-335D-4265-B529-B7AF0E1076AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCF07E6C-335D-4265-B529-B7AF0E1076AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FCF07E6C-335D-4265-B529-B7AF0E1076AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C28BC2BD-2D6A-4524-996E-45BA87B65B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C28BC2BD-2D6A-4524-996E-45BA87B65B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C28BC2BD-2D6A-4524-996E-45BA87B65B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C28BC2BD-2D6A-4524-996E-45BA87B65B9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06EB9559-89AE-487A-B80B-C4816B50A592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06EB9559-89AE-487A-B80B-C4816B50A592}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06EB9559-89AE-487A-B80B-C4816B50A592}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06EB9559-89AE-487A-B80B-C4816B50A592}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -356,6 +368,8 @@ Global
 		{B93FC354-D59D-4650-84E4-7FCA7D51689A} = {49BF96D3-3F1B-4553-BE55-296FA7C3F659}
 		{E51311BB-BCD0-4EDA-8D6A-E457B7D2FEE6} = {5D8A9D62-C11C-45B2-8965-43DE8160B558}
 		{FCF07E6C-335D-4265-B529-B7AF0E1076AB} = {E51311BB-BCD0-4EDA-8D6A-E457B7D2FEE6}
+		{C28BC2BD-2D6A-4524-996E-45BA87B65B9F} = {E51311BB-BCD0-4EDA-8D6A-E457B7D2FEE6}
+		{06EB9559-89AE-487A-B80B-C4816B50A592} = {E51311BB-BCD0-4EDA-8D6A-E457B7D2FEE6}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = src\NUnitFramework\tests\nunitlite.tests-2.0.csproj

diff --git a/src/NUnitFramework/framework/Internal/InvalidDataSourceException.cs b/src/NUnitFramework/framework/Internal/InvalidDataSourceException.cs
@@ -24,9 +24,7 @@
 namespace NUnit.Framework.Internal
 {
     using System;
-#if !NETSTANDARD1_6
     using System.Runtime.Serialization;
-#endif
 
     /// <summary>
     /// InvalidTestFixtureException is thrown when an appropriate test

diff --git a/src/NUnitFramework/framework/Internal/InvalidTestFixtureException.cs b/src/NUnitFramework/framework/Internal/InvalidTestFixtureException.cs
@@ -24,9 +24,7 @@
 namespace NUnit.Framework.Internal
 {
     using System;
-#if !NETSTANDARD1_6
     using System.Runtime.Serialization;
-#endif
 
     /// <summary>
     /// InvalidTestFixtureException is thrown when an appropriate test

diff --git a/src/NUnitFramework/framework/Internal/NUnitException.cs b/src/NUnitFramework/framework/Internal/NUnitException.cs
@@ -24,9 +24,7 @@
 namespace NUnit.Framework.Internal 
 {
     using System;
-#if !NETSTANDARD1_6
     using System.Runtime.Serialization;
-#endif
 
     /// <summary>
     /// Thrown when an assertion failed. Here to preserve the inner

diff --git a/src/NUnitFramework/framework/nunit.framework-netstandard.csproj b/src/NUnitFramework/framework/nunit.framework-netstandard.csproj
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\netstandard\</OutputPath>
-    <DefineConstants>TRACE;NUNIT_FRAMEWORK;PORTABLE</DefineConstants>
+    <DefineConstants>TRACE;NUNIT_FRAMEWORK;PORTABLE;NETSTANDARD1_6</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

diff --git a/src/NUnitFramework/framework/nunit.framework-netstandard.project.json b/src/NUnitFramework/framework/nunit.framework-netstandard.project.json
@@ -1,7 +1,8 @@
 {
   "supports": {},
   "dependencies": {
-    "NETStandard.Library": "1.6.0"
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.1"
   },
   "frameworks": {
     "netstandard1.6": {}

diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-2.0.csproj b/src/NUnitFramework/mock-assembly/mock-assembly-2.0.csproj
@@ -101,6 +101,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="mock-assembly-2.0.project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-2.0.project.json b/src/NUnitFramework/mock-assembly/mock-assembly-2.0.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net20": {}
+  }
+}
diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-3.5.csproj b/src/NUnitFramework/mock-assembly/mock-assembly-3.5.csproj
@@ -101,6 +101,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="mock-assembly-3.5.project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-3.5.project.json b/src/NUnitFramework/mock-assembly/mock-assembly-3.5.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net35": {}
+  }
+}
diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-4.0.csproj b/src/NUnitFramework/mock-assembly/mock-assembly-4.0.csproj
@@ -99,6 +99,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="mock-assembly-4.0.project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-4.0.project.json b/src/NUnitFramework/mock-assembly/mock-assembly-4.0.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net40": {}
+  }
+}
diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-4.5.csproj b/src/NUnitFramework/mock-assembly/mock-assembly-4.5.csproj
@@ -103,6 +103,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="mock-assembly-4.5.project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-4.5.project.json b/src/NUnitFramework/mock-assembly/mock-assembly-4.5.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net45": {}
+  }
+}
diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-netstandard.csproj b/src/NUnitFramework/mock-assembly/mock-assembly-netstandard.csproj
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{06EB9559-89AE-487A-B80B-C4816B50A592}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NUnit.Tests</RootNamespace>
+    <AssemblyName>mock-assembly</AssemblyName>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <IntermediateOutputPath>obj\$(Configuration)\netstandard\</IntermediateOutputPath>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\netstandard\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;PORTABLE;NETSTANDARD1_6</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\netstandard\</OutputPath>
+    <DefineConstants>TRACE;PORTABLE;NETSTANDARD1_6</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .NET Framework is automatically included -->
+    <ProjectReference Include="..\framework\nunit.framework-netstandard.csproj">
+      <Project>{FCF07E6C-335D-4265-B529-B7AF0E1076AB}</Project>
+      <Name>nunit.framework-netstandard</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\nunitlite\nunitlite-netstandard.csproj">
+      <Project>{ceb9520e-52f3-44d9-9a1a-1f935bf34400}</Project>
+      <Name>nunitlite-netstandard</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\CommonAssemblyInfo.cs">
+      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\FrameworkVersion.cs">
+      <Link>Properties\FrameworkVersion.cs</Link>
+    </Compile>
+    <Compile Include="MockAssembly.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\nunit.snk">
+      <Link>nunit.snk</Link>
+    </None>
+    <None Include="mock-assembly-netstandard.project.json" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup>
+    <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker>
+  </PropertyGroup>
+</Project>
diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-netstandard.project.json b/src/NUnitFramework/mock-assembly/mock-assembly-netstandard.project.json
@@ -0,0 +1,10 @@
+{
+  "supports": {},
+  "dependencies": {
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.1"
+  },
+  "frameworks": {
+    "netstandard1.6": {}
+  }
+}
diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-portable.csproj b/src/NUnitFramework/mock-assembly/mock-assembly-portable.csproj
@@ -62,6 +62,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="mock-assembly-portable.project.json" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/src/NUnitFramework/mock-assembly/mock-assembly-portable.project.json b/src/NUnitFramework/mock-assembly/mock-assembly-portable.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    ".NETPortable,Version=v4.5,Profile=Profile259": {}
+  }
+}
diff --git a/src/NUnitFramework/nunitlite/nunitlite-2.0.csproj b/src/NUnitFramework/nunitlite/nunitlite-2.0.csproj
@@ -95,6 +95,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="nunitlite-2.0.project.json" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/NUnitFramework/nunitlite/nunitlite-2.0.project.json b/src/NUnitFramework/nunitlite/nunitlite-2.0.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net20": {}
+  }
+}
diff --git a/src/NUnitFramework/nunitlite/nunitlite-3.5.csproj b/src/NUnitFramework/nunitlite/nunitlite-3.5.csproj
@@ -91,6 +91,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="nunitlite-3.5.project.json" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/NUnitFramework/nunitlite/nunitlite-3.5.project.json b/src/NUnitFramework/nunitlite/nunitlite-3.5.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net35": {}
+  }
+}
diff --git a/src/NUnitFramework/nunitlite/nunitlite-4.0.csproj b/src/NUnitFramework/nunitlite/nunitlite-4.0.csproj
@@ -90,6 +90,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="nunitlite-4.0.project.json" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/NUnitFramework/nunitlite/nunitlite-4.0.project.json b/src/NUnitFramework/nunitlite/nunitlite-4.0.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net40": {}
+  }
+}
diff --git a/src/NUnitFramework/nunitlite/nunitlite-4.5.csproj b/src/NUnitFramework/nunitlite/nunitlite-4.5.csproj
@@ -92,6 +92,7 @@
     <None Include="..\..\nunit.snk">
       <Link>nunit.snk</Link>
     </None>
+    <None Include="nunitlite-4.5.project.json" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/NUnitFramework/nunitlite/nunitlite-4.5.project.json b/src/NUnitFramework/nunitlite/nunitlite-4.5.project.json
@@ -0,0 +1,8 @@
+{
+  "runtimes": {
+    "win": {}
+  },
+  "frameworks": {
+    "net45": {}
+  }
+}