Update more projects to SL 121 cert for signing

dotnet · Jun 22, 2018 · b9859a7 · b9859a7
1 parent cdd11be
commit b9859a7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.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')" />
-  
+
   <!-- Include common build properties -->
   <Import Project="..\..\dir.props" />
- 
+
   <!-- Compilation options -->
   <PropertyGroup>
     <AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms>
@@ -17,13 +17,13 @@
 
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    
+
     <!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll -->
     <NoStdLib>true</NoStdLib>
     <NoCompilerStandardLib>true</NoCompilerStandardLib>
-    
+
     <SubsystemVersion>6.00</SubsystemVersion>
     <UTF8OutPut>true</UTF8OutPut>
     <HighEntropyVA>true</HighEntropyVA>
@@ -71,7 +71,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DefineConstants>WIN64;ARM64;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-  
+
   <!-- Configuration specific properties -->
   <PropertyGroup Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">
     <DebugSymbols>true</DebugSymbols>
@@ -116,20 +116,20 @@
     <MscorlibDir>$(MSBuildThisFileDirectory)</MscorlibDir>
     <NlpObjDir>$(BclSourcesRoot)\System\Globalization\Tables</NlpObjDir>
   </PropertyGroup>
-  
+
   <!-- Output paths -->
   <PropertyGroup>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootBinDir)obj</BaseIntermediateOutputPath>
     <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</IntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</OutputPath>
     <FinalOutputPath Condition="'$(FinalOutputPath)' == ''">$(BinDir)</FinalOutputPath>
   </PropertyGroup>
-  
+
   <!-- Msbuild variables needed to get CoreCLR features to be set properly. -->
   <PropertyGroup>
     <ClrProduct>core_clr</ClrProduct>
     <BuildForCoreSystem>true</BuildForCoreSystem>
-    
+
     <!-- These are needed by BCLRewriter -->
     <_BuildType Condition="'$(Configuration)' == 'Debug'">chk</_BuildType>
     <_BuildType Condition="'$(Configuration)' == 'Checked'">chk</_BuildType>
@@ -139,7 +139,7 @@
     <TargetArch Condition="'$(Platform)'=='x86'">i386</TargetArch>
     <TargetArch Condition="'$(Platform)'!='x86'">$(Platform)</TargetArch>
   </PropertyGroup>
-  
+
   <!-- CLR Features -->
   <Import Project="$(MSBuildThisFileDirectory)..\..\clr.coreclr.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\clr.defines.targets" />
@@ -164,7 +164,7 @@
     <Compile Include="@(MscorlibSources)">
     </Compile>
   </ItemGroup>
-  
+
   <!-- Resources -->
   <ItemGroup>
     <SplitTextStringResource Include="$(BclSourcesRoot)\System.Private.CoreLib.txt">
@@ -181,7 +181,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
 
   <PropertyGroup>
-    <StrongNameSig>Silverlight</StrongNameSig>
+    <StrongNameSig>SilverlightCert121</StrongNameSig>
   </PropertyGroup>
 
   <!-- Import signing tools -->

diff --git a/src/mscorlib/facade/mscorlib.csproj b/src/mscorlib/facade/mscorlib.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  
+
   <PropertyGroup>
     <AssemblyName>mscorlib</AssemblyName>
     <ProjectGuid>{263342A6-FC48-4CFC-B16A-2AF964D3536C}</ProjectGuid>
@@ -55,8 +55,8 @@
   <PropertyGroup>
     <BaseIntermediateOutputPath>$(RootBinDir)\obj</BaseIntermediateOutputPath>
     <!-- Note the trailing '\\' - they are needed so that genfacade does not fail due to an invalid path
-         In particular, the facadepath is sent in quotes. 
-         And the IntermediateOutputPath is required to end in a '\' in the coreclr repo. This means that the 
+         In particular, the facadepath is sent in quotes.
+         And the IntermediateOutputPath is required to end in a '\' in the coreclr repo. This means that the
          facadepath ends up being sent as 'mypath\"' and that trips the Path normalization.
          Introducing a second '\' tricks the normalization logic to treat this '\\"' as '\"' and not complain.    -->
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)\facade\\</IntermediateOutputPath>
@@ -66,7 +66,7 @@
   <ItemGroup>
     <ProjectReference Include="..\System.Private.CoreLib.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Include="TypeForwards.cs" />
   </ItemGroup>
@@ -76,7 +76,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <StrongNameSig>Silverlight</StrongNameSig>
+    <StrongNameSig>SilverlightCert121</StrongNameSig>
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

diff --git a/src/mscorlib/mscorlib.csproj b/src/mscorlib/mscorlib.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.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')" />
-  
+
   <!-- Include common build properties -->
   <Import Project="..\..\dir.props" />
- 
+
   <!-- Compilation options -->
   <PropertyGroup>
     <AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms>
@@ -17,13 +17,13 @@
 
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    
+
     <!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll -->
     <NoStdLib>true</NoStdLib>
     <NoCompilerStandardLib>true</NoCompilerStandardLib>
-    
+
     <SubsystemVersion>6.00</SubsystemVersion>
     <UTF8OutPut>true</UTF8OutPut>
     <HighEntropyVA>true</HighEntropyVA>
@@ -69,7 +69,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DefineConstants>WIN64;ARM64;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
-  
+
   <!-- Configuration specific properties -->
   <PropertyGroup Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">
     <DebugSymbols>true</DebugSymbols>
@@ -114,20 +114,20 @@
     <MscorlibDir>$(MSBuildThisFileDirectory)</MscorlibDir>
     <NlpObjDir>$(BclSourcesRoot)\System\Globalization\Tables</NlpObjDir>
   </PropertyGroup>
-  
+
   <!-- Output paths -->
   <PropertyGroup>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootBinDir)obj</BaseIntermediateOutputPath>
     <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</IntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</OutputPath>
     <FinalOutputPath Condition="'$(FinalOutputPath)' == ''">$(BinDir)</FinalOutputPath>
   </PropertyGroup>
-  
+
   <!-- Msbuild variables needed to get CoreCLR features to be set properly. -->
   <PropertyGroup>
     <ClrProduct>core_clr</ClrProduct>
     <BuildForCoreSystem>true</BuildForCoreSystem>
-    
+
     <!-- These are needed by BCLRewriter -->
     <_BuildType Condition="'$(Configuration)' == 'Debug'">chk</_BuildType>
     <_BuildType Condition="'$(Configuration)' == 'Checked'">chk</_BuildType>
@@ -137,7 +137,7 @@
     <TargetArch Condition="'$(Platform)'=='x86'">i386</TargetArch>
     <TargetArch Condition="'$(Platform)'!='x86'">$(Platform)</TargetArch>
   </PropertyGroup>
-  
+
   <!-- CLR Features -->
   <Import Project="$(MSBuildThisFileDirectory)..\..\clr.coreclr.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\..\clr.defines.targets" />
@@ -162,7 +162,7 @@
     <Compile Include="@(MscorlibSources)">
     </Compile>
   </ItemGroup>
-  
+
   <!-- Resources -->
   <ItemGroup>
     <SplitTextStringResource Include="$(BclSourcesRoot)\mscorlib.txt">
@@ -179,7 +179,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
 
   <PropertyGroup>
-    <StrongNameSig>Silverlight</StrongNameSig>
+    <StrongNameSig>SilverlightCert121</StrongNameSig>
   </PropertyGroup>
 
   <!-- Import signing tools -->

diff --git a/src/mscorlib/ref/mscorlib.csproj b/src/mscorlib/ref/mscorlib.csproj
@@ -14,13 +14,13 @@
 
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    
+
     <!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
     <!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll -->
     <NoStdLib>true</NoStdLib>
     <NoCompilerStandardLib>true</NoCompilerStandardLib>
-    
+
     <ErrorReport>prompt</ErrorReport>
     <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
     <CLSCompliant>true</CLSCompliant>
@@ -38,7 +38,7 @@
   <PropertyGroup Condition="'$(TargetsUnix)'!='true'">
     <DefineConstants>$(DefineConstants);FEATURE_COREFX_GLOBALIZATION;FEATURE_COMINTEROP</DefineConstants>
   </PropertyGroup>
- 
+
   <!-- Roslyn does not support writing PDBs on Unix -->
   <PropertyGroup Condition="'$(OsEnvironment)' == 'Unix'">
     <DebugSymbols>false</DebugSymbols>
@@ -68,7 +68,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
 
   <PropertyGroup>
-    <StrongNameSig>Silverlight</StrongNameSig>
+    <StrongNameSig>SilverlightCert121</StrongNameSig>
   </PropertyGroup>
 
   <!-- Import signing tools -->