update build + add net472 target

leastprivilege · leastprivilege · commit 4c5a7b35b942 · 2019-11-05T17:06:39.000+01:00
diff --git a/build/Program.cs b/build/Program.cs
@@ -9,12 +9,15 @@ namespace build
 {
     class Program
     {
-        private const bool RequireTests = true;
+        private static class Targets
+        {
+            public const string Build = "build";
+            public const string Test = "test";
+            public const string Pack = "pack";
+        }
+
+        static string BinaryToSign = "IdentityModel.OidcClient.dll";
 
-        private const string ArtifactsDir = "artifacts";
-        private const string Build = "build";
-        private const string Test = "test";
-        private const string Pack = "pack";
         
         static void Main(string[] args)
         {
@@ -25,52 +28,35 @@ static void Main(string[] args)
 
             app.OnExecute(() =>
             {
-                Target(Build, () => 
+                Target(Targets.Build, () => 
                 {
-                    var solution = Directory.GetFiles(".", "*.sln", SearchOption.TopDirectoryOnly).First();
-
-                    Run("dotnet", $"build {solution} -c Release");
+                    Run("dotnet", $"build -c Release");
 
                     if (sign.HasValue())
                     {
-                        Sign("IdentityModel.OidcClient.dll", "./src/bin/release");
+                        Sign(BinaryToSign, "./src/bin/release");
                     }
                 });
 
-                Target(Test, DependsOn(Build), () => 
+                Target(Targets.Test, DependsOn(Targets.Build), () => 
                 {
-                    try
-                    {
-                        var tests = Directory.GetFiles("./test", "*.csproj", SearchOption.AllDirectories);
-
-                        foreach (var test in tests)
-                        {
-                            Run("dotnet", $"test {test} -c Release --no-build");
-                        }    
-                    }
-                    catch (System.IO.DirectoryNotFoundException ex)
-                    {
-                        if (RequireTests)
-                        {
-                            throw new Exception($"No tests found: {ex.Message}");
-                        };
-                    }
+                    Run("dotnet", $"test -c Release --no-build");
                 });
                 
-                Target(Pack, DependsOn(Build), () => 
+                Target(Targets.Pack, DependsOn(Targets.Test), () => 
                 {
                     var project = Directory.GetFiles("./src", "*.csproj", SearchOption.TopDirectoryOnly).First();
 
-                    Run("dotnet", $"pack {project} -c Release -o ./{ArtifactsDir} --no-build");
+                    Run("dotnet", $"pack {project} -c Release -o ./artifacts --no-build");
                     
                     if (sign.HasValue())
                     {
-                        Sign("*.nupkg", $"./{ArtifactsDir}");
+                        Sign("*.nupkg", $"./artifacts");
                     }
                 });
 
 
-                Target("default", DependsOn(Test, Pack));
+                Target("default", DependsOn(Targets.Test, Targets.Pack));
                 RunTargetsAndExit(app.RemainingArguments);
             });
 
@@ -97,15 +83,15 @@ private static void Sign(string extension, string directory)
             foreach (var file in files)
             {
                 Console.WriteLine("  Signing " + file);
-                Run("./tools/signclient", $"sign -c {signClientConfig} -i {file} -r sc-ids@dotnetfoundation.org -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);
+                Run("dotnet", $"SignClient sign -c {signClientConfig} -i {file} -r sc-ids@dotnetfoundation.org -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);
             }
         }
 
         private static void CleanArtifacts()
         {
-            Directory.CreateDirectory($"./{ArtifactsDir}");
+            Directory.CreateDirectory($"./artifacts");
 
-            foreach (var file in Directory.GetFiles($"./{ArtifactsDir}"))
+            foreach (var file in Directory.GetFiles($"./artifacts"))
             {
                 File.Delete(file);
             }
diff --git a/build/build.csproj b/build/build.csproj
@@ -5,10 +5,10 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Bullseye" Version="2.3.0" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.3.3" />
-    <PackageReference Include="SimpleExec" Version="5.0.1" />
+   <ItemGroup>
+    <PackageReference Include="Bullseye" Version="3.0.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.4.1" />
+    <PackageReference Include="SimpleExec" Version="6.0.0" />
   </ItemGroup>
   
 </Project>
diff --git a/src/IdentityModel.OidcClient.csproj b/src/IdentityModel.OidcClient.csproj
@@ -4,7 +4,7 @@
       <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-      <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+      <TargetFrameworks>net461;net472;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IdentityModel" Version="4.0.0" />
+    <PackageReference Include="IdentityModel" Version="4.1.0" />
     <PackageReference Include="minver" Version="2.0.0" PrivateAssets="All" />
     
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
diff --git a/test/IdentityModel.OidcClient.Tests/IdentityModel.OidcClient.Tests.csproj b/test/IdentityModel.OidcClient.Tests/IdentityModel.OidcClient.Tests.csproj
@@ -4,7 +4,7 @@
       <TargetFrameworks>netcoreapp2.1;netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-      <TargetFrameworks>net461;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
+      <TargetFrameworks>net461;net472;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/test/IdentityModel.OidcClient.Tests/Infrastructure/Crypto.cs b/test/IdentityModel.OidcClient.Tests/Infrastructure/Crypto.cs
@@ -26,15 +26,15 @@ public static RsaSecurityKey CreateKey()
         {
             var rsa = RSA.Create();
 
-#if NET452 || NET461
+#if NET452 || NET461 || NET472
             if (rsa.KeySize < 2048)
             {
                 rsa.Dispose();
                 rsa = new RSACryptoServiceProvider(2048);
             }
 #endif
             RsaSecurityKey key = null;
-#if NET452 || NET461
+#if NET452 || NET461 || NET472
             if (rsa is RSACryptoServiceProvider) 
             {
                 var parameters = rsa.ExportParameters(includePrivateParameters: true);

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,15 @@ namespace build`
`9`	`9`	`{`
`10`	`10`	`class Program`
`11`	`11`	`{`
`12`		`- private const bool RequireTests = true;`
	`12`	`+ private static class Targets`
	`13`	`+ {`
	`14`	`+ public const string Build = "build";`
	`15`	`+ public const string Test = "test";`
	`16`	`+ public const string Pack = "pack";`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ static string BinaryToSign = "IdentityModel.OidcClient.dll";`
`13`	`20`
`14`		`- private const string ArtifactsDir = "artifacts";`
`15`		`- private const string Build = "build";`
`16`		`- private const string Test = "test";`
`17`		`- private const string Pack = "pack";`
`18`	`21`
`19`	`22`	`static void Main(string[] args)`
`20`	`23`	`{`
`@@ -25,52 +28,35 @@ static void Main(string[] args)`
`25`	`28`
`26`	`29`	`app.OnExecute(() =>`
`27`	`30`	`{`
`28`		`- Target(Build, () =>`
	`31`	`+ Target(Targets.Build, () =>`
`29`	`32`	`{`
`30`		`- var solution = Directory.GetFiles(".", "*.sln", SearchOption.TopDirectoryOnly).First();`
`31`		`-`
`32`		`- Run("dotnet", $"build {solution} -c Release");`
	`33`	`+ Run("dotnet", $"build -c Release");`
`33`	`34`
`34`	`35`	`if (sign.HasValue())`
`35`	`36`	`{`
`36`		`- Sign("IdentityModel.OidcClient.dll", "./src/bin/release");`
	`37`	`+ Sign(BinaryToSign, "./src/bin/release");`
`37`	`38`	`}`
`38`	`39`	`});`
`39`	`40`
`40`		`- Target(Test, DependsOn(Build), () =>`
	`41`	`+ Target(Targets.Test, DependsOn(Targets.Build), () =>`
`41`	`42`	`{`
`42`		`- try`
`43`		`- {`
`44`		`- var tests = Directory.GetFiles("./test", "*.csproj", SearchOption.AllDirectories);`
`45`		`-`
`46`		`- foreach (var test in tests)`
`47`		`- {`
`48`		`- Run("dotnet", $"test {test} -c Release --no-build");`
`49`		`- }`
`50`		`- }`
`51`		`- catch (System.IO.DirectoryNotFoundException ex)`
`52`		`- {`
`53`		`- if (RequireTests)`
`54`		`- {`
`55`		`- throw new Exception($"No tests found: {ex.Message}");`
`56`		`- };`
`57`		`- }`
	`43`	`+ Run("dotnet", $"test -c Release --no-build");`
`58`	`44`	`});`
`59`	`45`
`60`		`- Target(Pack, DependsOn(Build), () =>`
	`46`	`+ Target(Targets.Pack, DependsOn(Targets.Test), () =>`
`61`	`47`	`{`
`62`	`48`	`var project = Directory.GetFiles("./src", "*.csproj", SearchOption.TopDirectoryOnly).First();`
`63`	`49`
`64`		`- Run("dotnet", $"pack {project} -c Release -o ./{ArtifactsDir} --no-build");`
	`50`	`+ Run("dotnet", $"pack {project} -c Release -o ./artifacts --no-build");`
`65`	`51`
`66`	`52`	`if (sign.HasValue())`
`67`	`53`	`{`
`68`		`- Sign("*.nupkg", $"./{ArtifactsDir}");`
	`54`	`+ Sign("*.nupkg", $"./artifacts");`
`69`	`55`	`}`
`70`	`56`	`});`
`71`	`57`
`72`	`58`
`73`		`- Target("default", DependsOn(Test, Pack));`
	`59`	`+ Target("default", DependsOn(Targets.Test, Targets.Pack));`
`74`	`60`	`RunTargetsAndExit(app.RemainingArguments);`
`75`	`61`	`});`
`76`	`62`
`@@ -97,15 +83,15 @@ private static void Sign(string extension, string directory)`
`97`	`83`	`foreach (var file in files)`
`98`	`84`	`{`
`99`	`85`	`Console.WriteLine(" Signing " + file);`
`100`		`- Run("./tools/signclient", $"sign -c {signClientConfig} -i {file} -r [email protected] -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);`
	`86`	`+ Run("dotnet", $"SignClient sign -c {signClientConfig} -i {file} -r [email protected] -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);`
`101`	`87`	`}`
`102`	`88`	`}`
`103`	`89`
`104`	`90`	`private static void CleanArtifacts()`
`105`	`91`	`{`
`106`		`- Directory.CreateDirectory($"./{ArtifactsDir}");`
	`92`	`+ Directory.CreateDirectory($"./artifacts");`
`107`	`93`
`108`		`- foreach (var file in Directory.GetFiles($"./{ArtifactsDir}"))`
	`94`	`+ foreach (var file in Directory.GetFiles($"./artifacts"))`
`109`	`95`	`{`
`110`	`96`	`File.Delete(file);`
`111`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ public static RsaSecurityKey CreateKey()`
`26`	`26`	`{`
`27`	`27`	`var rsa = RSA.Create();`
`28`	`28`
`29`		`-#if NET452 \|\| NET461`
	`29`	`+#if NET452 \|\| NET461 \|\| NET472`
`30`	`30`	`if (rsa.KeySize < 2048)`
`31`	`31`	`{`
`32`	`32`	`rsa.Dispose();`
`33`	`33`	`rsa = new RSACryptoServiceProvider(2048);`
`34`	`34`	`}`
`35`	`35`	`#endif`
`36`	`36`	`RsaSecurityKey key = null;`
`37`		`-#if NET452 \|\| NET461`
	`37`	`+#if NET452 \|\| NET461 \|\| NET472`
`38`	`38`	`if (rsa is RSACryptoServiceProvider)`
`39`	`39`	`{`
`40`	`40`	`var parameters = rsa.ExportParameters(includePrivateParameters: true);`