Remove NET452 Target (#901)

* modify csproj and build * Re-enable pack on non-Windows * update readme
IdentityServer · Mar 10, 2017 · 8473e74 · 8473e74
1 parent b09ec7f
commit 8473e74
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -19,9 +19,11 @@ This is the main repo for IdentityServer4 - but there's more:
 
 IdentityServer is built against ASP.NET Core 1.1 using the RTM tooling that ships with Visual Studio 2017. This is the only configuration we support on the issue tracker.
 
+IdentityServer is a netstandard 1.4 library, which means it is compatible with .NET Core 1.1 and .NET Framework 4.6.1. See [here](https://docs.microsoft.com/en-us/dotnet/articles/standard/library) for more details.
+
 ### How to build
 
-* [Install](https://www.microsoft.com/net/download/core#/current) .NET Core 1.1 
+* [Install](https://www.microsoft.com/net/download/core) .NET Core 1.1 
 * Run build.ps1 from Powershell
 
 ### Acknowledgements

diff --git a/build.cake b/build.cake
@@ -18,24 +18,14 @@ Task("Build")
             Configuration = configuration
         };
 
-    if (!IsRunningOnWindows())
-        {
-            settings.Framework = "netstandard1.4";
-        }
-
     DotNetCoreBuild(Directory("./src/IdentityServer4"), settings);
-    
-    if (!IsRunningOnWindows())
-        {
-            settings.Framework = "netcoreapp1.1";
-        }
-
     DotNetCoreBuild(Directory("./src/Host"), settings);     
+    
     DotNetCoreBuild(Directory("./test/IdentityServer.IntegrationTests"), settings);
     DotNetCoreBuild(Directory("./test/IdentityServer.UnitTests"), settings);
 });
 
-Task("RunTests")
+Task("Test")
     .IsDependentOn("Restore")
     .IsDependentOn("Clean")
     .Does(() =>
@@ -49,12 +39,6 @@ Task("RunTests")
             Configuration = configuration
         };
 
-        if (!IsRunningOnWindows())
-        {
-            Information("Not running on Windows - skipping tests for full .NET Framework");
-            settings.Framework = "netcoreapp1.1";
-        }
-
         DotNetCoreTest(project.FullPath, settings);
     }
 });
@@ -64,12 +48,6 @@ Task("Pack")
     .IsDependentOn("Clean")
     .Does(() =>
 {
-    if (!IsRunningOnWindows())
-        {
-            Information("Not running on Windows - skipping pack");
-            return;
-        }
-
     var settings = new DotNetCorePackSettings
     {
         Configuration = configuration,
@@ -109,7 +87,7 @@ Task("Restore")
 
 Task("Default")
   .IsDependentOn("Build")
-  .IsDependentOn("RunTests")
+  .IsDependentOn("Test")
   .IsDependentOn("Pack");
 
 RunTarget(target);
diff --git a/src/IdentityServer4/IdentityServer4.csproj b/src/IdentityServer4/IdentityServer4.csproj
@@ -4,7 +4,7 @@
     <Description>OpenID Connect and OAuth 2.0 Framework for ASP.NET Core</Description>
     <VersionPrefix>1.3.0</VersionPrefix>
     <Authors>Brock Allen;Dominick Baier</Authors>
-    <TargetFrameworks>netstandard1.4;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4</TargetFrameworks>
     <AssemblyName>IdentityServer4</AssemblyName>
     <PackageId>IdentityServer4</PackageId>
     <PackageTags>OAuth2;OAuth 2.0;OpenID Connect;Security;Identity;IdentityServer</PackageTags>
@@ -33,9 +33,4 @@
     <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj b/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <AssemblyName>IdentityServer.IntegrationTests</AssemblyName>
     <PackageId>IdentityServer.IntegrationTests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -33,11 +33,6 @@
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>

diff --git a/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj b/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <AssemblyName>IdentityServer.UnitTests</AssemblyName>
     <PackageId>IdentityServer.UnitTests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -33,11 +33,6 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>