Merge pull request #77 from sharwell/signing-policy

Signing policy
tunnelvisionlabs · Dec 8, 2014 · 17bd0dc · 17bd0dc
2 parents cc53810 + a387fbf
commit 17bd0dc
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 27 deletions.
diff --git a/Build/build.ps1 b/Build/build.ps1
@@ -21,12 +21,18 @@ If ($Debug) {
 	$BuildConfig = 'Release'
 }
 
+If ($Version.Contains('-')) {
+	$KeyConfiguration = 'Dev'
+} Else {
+	$KeyConfiguration = 'Final'
+}
+
 # build the main project
 $nuget = '..\.nuget\NuGet.exe'
 $msbuild = "$env:windir\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe"
 
 &$nuget 'restore' $SolutionPath
-&$msbuild '/nologo' '/m' '/nr:false' '/t:rebuild' "/p:Configuration=$BuildConfig" "/p:VisualStudioVersion=$VisualStudioVersion" $SolutionPath
+&$msbuild '/nologo' '/m' '/nr:false' '/t:rebuild' "/p:Configuration=$BuildConfig" "/p:VisualStudioVersion=$VisualStudioVersion" "/p:KeyConfiguration=$KeyConfiguration" $SolutionPath
 if ($LASTEXITCODE -ne 0) {
 	$host.ui.WriteErrorLine('Build failed, aborting!')
 	exit $p.ExitCode

diff --git a/Build/keys.ps1 b/Build/keys.ps1
@@ -1,11 +1,29 @@
-# Note: these values may only change during minor release
-$Keys = @{
-	'net35-client' = '8b3790928cb57ea0'
-	'net40-client' = 'b3a60e8d525c0432'
-	'net45' = 'c5149d599dccb791'
-	'netcore45' = 'c0beeaaf4ff18c32'
-	'portable-net40' = '165cb04bbaa60d42'
-	'portable-net45' = '7c9e9383f8e98b3a'
+# Note: these values may only change during major release
+
+If ($Version.Contains('-')) {
+
+	# Use the development keys
+	$Keys = @{
+		'net35-client' = 'bb62785d398726f0'
+		'net40-client' = '2c5e0ae13bddb49e'
+		'net45' = '2c5e0ae13bddb49e'
+		'netcore45' = '2c5e0ae13bddb49e'
+		'portable-net40' = '2c5e0ae13bddb49e'
+		'portable-net45' = '2c5e0ae13bddb49e'
+	}
+
+} Else {
+
+	# Use the final release keys
+	$Keys = @{
+		'net35-client' = 'd693b28384d1c375'
+		'net40-client' = 'fd26f941b2df1ee3'
+		'net45' = 'fd26f941b2df1ee3'
+		'netcore45' = 'fd26f941b2df1ee3'
+		'portable-net40' = 'fd26f941b2df1ee3'
+		'portable-net45' = 'fd26f941b2df1ee3'
+	}
+
 }
 
 function Resolve-FullPath() {

diff --git a/Build/keys/Rackspace.Threading.dev.net35.snk b/Build/keys/Rackspace.Threading.dev.net35.snk
diff --git a/Build/keys/Rackspace.Threading.dev.snk b/Build/keys/Rackspace.Threading.dev.snk
diff --git a/Build/keys/Rackspace.Threading.net35.snk b/Build/keys/Rackspace.Threading.net35.snk
diff --git a/Build/keys/Rackspace.Threading.snk b/Build/keys/Rackspace.Threading.snk
diff --git a/Rackspace.Threading/Rackspace.Threading.net35-client.csproj b/Rackspace.Threading/Rackspace.Threading.net35-client.csproj
@@ -38,7 +38,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\keys\Rackspace.Threading.net35-client.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' == 'Final'">..\Build\keys\Rackspace.Threading.net35.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' != 'Final'">..\Build\keys\Rackspace.Threading.dev.net35.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -69,8 +70,11 @@
     <Compile Include="WebRequestExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\keys\Rackspace.Threading.net35-client.snk">
-      <Link>Rackspace.Threading.net35-client.snk</Link>
+    <None Include="..\Build\keys\Rackspace.Threading.dev.net35.snk">
+      <Link>Rackspace.Threading.dev.net35.snk</Link>
+    </None>
+    <None Include="..\Build\keys\Rackspace.Threading.net35.snk">
+      <Link>Rackspace.Threading.net35.snk</Link>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/Rackspace.Threading/Rackspace.Threading.net40-client.csproj b/Rackspace.Threading/Rackspace.Threading.net40-client.csproj
@@ -38,7 +38,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\keys\Rackspace.Threading.net40-client.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' == 'Final'">..\Build\keys\Rackspace.Threading.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' != 'Final'">..\Build\keys\Rackspace.Threading.dev.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -76,8 +77,11 @@
     <Compile Include="WebRequestExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\keys\Rackspace.Threading.net40-client.snk">
-      <Link>Rackspace.Threading.net40-client.snk</Link>
+    <None Include="..\Build\keys\Rackspace.Threading.dev.snk">
+      <Link>Rackspace.Threading.dev.snk</Link>
+    </None>
+    <None Include="..\Build\keys\Rackspace.Threading.snk">
+      <Link>Rackspace.Threading.snk</Link>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/Rackspace.Threading/Rackspace.Threading.net45.csproj b/Rackspace.Threading/Rackspace.Threading.net45.csproj
@@ -37,7 +37,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\keys\Rackspace.Threading.net45.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' == 'Final'">..\Build\keys\Rackspace.Threading.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' != 'Final'">..\Build\keys\Rackspace.Threading.dev.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -66,8 +67,11 @@
     <Compile Include="WebRequestExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\keys\Rackspace.Threading.net45.snk">
-      <Link>Rackspace.Threading.net45.snk</Link>
+    <None Include="..\Build\keys\Rackspace.Threading.dev.snk">
+      <Link>Rackspace.Threading.dev.snk</Link>
+    </None>
+    <None Include="..\Build\keys\Rackspace.Threading.snk">
+      <Link>Rackspace.Threading.snk</Link>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/Rackspace.Threading/Rackspace.Threading.netcore45.csproj b/Rackspace.Threading/Rackspace.Threading.netcore45.csproj
@@ -38,7 +38,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\keys\Rackspace.Threading.netcore45.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' == 'Final'">..\Build\keys\Rackspace.Threading.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' != 'Final'">..\Build\keys\Rackspace.Threading.dev.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CancellationTokenSourceExtensions.cs" />
@@ -58,8 +59,11 @@
     <Compile Include="WebRequestExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\keys\Rackspace.Threading.netcore45.snk">
-      <Link>Rackspace.Threading.netcore45.snk</Link>
+    <None Include="..\Build\keys\Rackspace.Threading.dev.snk">
+      <Link>Rackspace.Threading.dev.snk</Link>
+    </None>
+    <None Include="..\Build\keys\Rackspace.Threading.snk">
+      <Link>Rackspace.Threading.snk</Link>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/Rackspace.Threading/Rackspace.Threading.portable-net40.csproj b/Rackspace.Threading/Rackspace.Threading.portable-net40.csproj
@@ -39,7 +39,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\keys\Rackspace.Threading.portable-net40.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' == 'Final'">..\Build\keys\Rackspace.Threading.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' != 'Final'">..\Build\keys\Rackspace.Threading.dev.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CancellationTokenSourceExtensions.cs" />
@@ -59,8 +60,11 @@
     <Compile Include="WebRequestExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\keys\Rackspace.Threading.portable-net40.snk">
-      <Link>Rackspace.Threading.portable-net40.snk</Link>
+    <None Include="..\Build\keys\Rackspace.Threading.dev.snk">
+      <Link>Rackspace.Threading.dev.snk</Link>
+    </None>
+    <None Include="..\Build\keys\Rackspace.Threading.snk">
+      <Link>Rackspace.Threading.snk</Link>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/Rackspace.Threading/Rackspace.Threading.portable-net45.csproj b/Rackspace.Threading/Rackspace.Threading.portable-net45.csproj
@@ -40,7 +40,8 @@
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\..\keys\Rackspace.Threading.portable-net45.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' == 'Final'">..\Build\keys\Rackspace.Threading.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile Condition="'$(KeyConfiguration)' != 'Final'">..\Build\keys\Rackspace.Threading.dev.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CancellationTokenSourceExtensions.cs" />
@@ -60,8 +61,11 @@
     <Compile Include="WebRequestExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\keys\Rackspace.Threading.portable-net45.snk">
-      <Link>Rackspace.Threading.portable-net45.snk</Link>
+    <None Include="..\Build\keys\Rackspace.Threading.dev.snk">
+      <Link>Rackspace.Threading.dev.snk</Link>
+    </None>
+    <None Include="..\Build\keys\Rackspace.Threading.snk">
+      <Link>Rackspace.Threading.snk</Link>
     </None>
   </ItemGroup>
   <ItemGroup>