Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit b9859a7

Browse files
weshaggardweshaggard
committed
Update more projects to SL 121 cert for signing
1 parent cdd11be commit b9859a7

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

‎src/mscorlib/System.Private.CoreLib.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
4+
55
<!-- Include common build properties -->
66
<Import Project="..\..\dir.props" />
7-
7+
88
<!-- Compilation options -->
99
<PropertyGroup>
1010
<AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms>
@@ -17,13 +17,13 @@
1717

1818
<OutputType>Library</OutputType>
1919
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
20-
20+
2121
<!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
2222
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
2323
<!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll -->
2424
<NoStdLib>true</NoStdLib>
2525
<NoCompilerStandardLib>true</NoCompilerStandardLib>
26-
26+
2727
<SubsystemVersion>6.00</SubsystemVersion>
2828
<UTF8OutPut>true</UTF8OutPut>
2929
<HighEntropyVA>true</HighEntropyVA>
@@ -71,7 +71,7 @@
7171
<PlatformTarget>AnyCPU</PlatformTarget>
7272
<DefineConstants>WIN64;ARM64;$(DefineConstants)</DefineConstants>
7373
</PropertyGroup>
74-
74+
7575
<!-- Configuration specific properties -->
7676
<PropertyGroup Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">
7777
<DebugSymbols>true</DebugSymbols>
@@ -116,20 +116,20 @@
116116
<MscorlibDir>$(MSBuildThisFileDirectory)</MscorlibDir>
117117
<NlpObjDir>$(BclSourcesRoot)\System\Globalization\Tables</NlpObjDir>
118118
</PropertyGroup>
119-
119+
120120
<!-- Output paths -->
121121
<PropertyGroup>
122122
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootBinDir)obj</BaseIntermediateOutputPath>
123123
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</IntermediateOutputPath>
124124
<OutputPath Condition="'$(OutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</OutputPath>
125125
<FinalOutputPath Condition="'$(FinalOutputPath)' == ''">$(BinDir)</FinalOutputPath>
126126
</PropertyGroup>
127-
127+
128128
<!-- Msbuild variables needed to get CoreCLR features to be set properly. -->
129129
<PropertyGroup>
130130
<ClrProduct>core_clr</ClrProduct>
131131
<BuildForCoreSystem>true</BuildForCoreSystem>
132-
132+
133133
<!-- These are needed by BCLRewriter -->
134134
<_BuildType Condition="'$(Configuration)' == 'Debug'">chk</_BuildType>
135135
<_BuildType Condition="'$(Configuration)' == 'Checked'">chk</_BuildType>
@@ -139,7 +139,7 @@
139139
<TargetArch Condition="'$(Platform)'=='x86'">i386</TargetArch>
140140
<TargetArch Condition="'$(Platform)'!='x86'">$(Platform)</TargetArch>
141141
</PropertyGroup>
142-
142+
143143
<!-- CLR Features -->
144144
<Import Project="$(MSBuildThisFileDirectory)..\..\clr.coreclr.props" />
145145
<Import Project="$(MSBuildThisFileDirectory)..\..\clr.defines.targets" />
@@ -164,7 +164,7 @@
164164
<Compile Include="@(MscorlibSources)">
165165
</Compile>
166166
</ItemGroup>
167-
167+
168168
<!-- Resources -->
169169
<ItemGroup>
170170
<SplitTextStringResource Include="$(BclSourcesRoot)\System.Private.CoreLib.txt">
@@ -181,7 +181,7 @@
181181
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
182182

183183
<PropertyGroup>
184-
<StrongNameSig>Silverlight</StrongNameSig>
184+
<StrongNameSig>SilverlightCert121</StrongNameSig>
185185
</PropertyGroup>
186186

187187
<!-- Import signing tools -->

‎src/mscorlib/facade/mscorlib.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4-
4+
55
<PropertyGroup>
66
<AssemblyName>mscorlib</AssemblyName>
77
<ProjectGuid>{263342A6-FC48-4CFC-B16A-2AF964D3536C}</ProjectGuid>
@@ -55,8 +55,8 @@
5555
<PropertyGroup>
5656
<BaseIntermediateOutputPath>$(RootBinDir)\obj</BaseIntermediateOutputPath>
5757
<!-- Note the trailing '\\' - they are needed so that genfacade does not fail due to an invalid path
58-
In particular, the facadepath is sent in quotes.
59-
And the IntermediateOutputPath is required to end in a '\' in the coreclr repo. This means that the
58+
In particular, the facadepath is sent in quotes.
59+
And the IntermediateOutputPath is required to end in a '\' in the coreclr repo. This means that the
6060
facadepath ends up being sent as 'mypath\"' and that trips the Path normalization.
6161
Introducing a second '\' tricks the normalization logic to treat this '\\"' as '\"' and not complain. -->
6262
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)\facade\\</IntermediateOutputPath>
@@ -66,7 +66,7 @@
6666
<ItemGroup>
6767
<ProjectReference Include="..\System.Private.CoreLib.csproj" />
6868
</ItemGroup>
69-
69+
7070
<ItemGroup>
7171
<Compile Include="TypeForwards.cs" />
7272
</ItemGroup>
@@ -76,7 +76,7 @@
7676
</ItemGroup>
7777

7878
<PropertyGroup>
79-
<StrongNameSig>Silverlight</StrongNameSig>
79+
<StrongNameSig>SilverlightCert121</StrongNameSig>
8080
</PropertyGroup>
8181

8282
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

‎src/mscorlib/mscorlib.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
4+
55
<!-- Include common build properties -->
66
<Import Project="..\..\dir.props" />
7-
7+
88
<!-- Compilation options -->
99
<PropertyGroup>
1010
<AvailablePlatforms>amd64,x86,arm,arm64</AvailablePlatforms>
@@ -17,13 +17,13 @@
1717

1818
<OutputType>Library</OutputType>
1919
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
20-
20+
2121
<!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
2222
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
2323
<!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll -->
2424
<NoStdLib>true</NoStdLib>
2525
<NoCompilerStandardLib>true</NoCompilerStandardLib>
26-
26+
2727
<SubsystemVersion>6.00</SubsystemVersion>
2828
<UTF8OutPut>true</UTF8OutPut>
2929
<HighEntropyVA>true</HighEntropyVA>
@@ -69,7 +69,7 @@
6969
<PlatformTarget>AnyCPU</PlatformTarget>
7070
<DefineConstants>WIN64;ARM64;$(DefineConstants)</DefineConstants>
7171
</PropertyGroup>
72-
72+
7373
<!-- Configuration specific properties -->
7474
<PropertyGroup Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">
7575
<DebugSymbols>true</DebugSymbols>
@@ -114,20 +114,20 @@
114114
<MscorlibDir>$(MSBuildThisFileDirectory)</MscorlibDir>
115115
<NlpObjDir>$(BclSourcesRoot)\System\Globalization\Tables</NlpObjDir>
116116
</PropertyGroup>
117-
117+
118118
<!-- Output paths -->
119119
<PropertyGroup>
120120
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootBinDir)obj</BaseIntermediateOutputPath>
121121
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</IntermediateOutputPath>
122122
<OutputPath Condition="'$(OutputPath)' == ''">$(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(Configuration)</OutputPath>
123123
<FinalOutputPath Condition="'$(FinalOutputPath)' == ''">$(BinDir)</FinalOutputPath>
124124
</PropertyGroup>
125-
125+
126126
<!-- Msbuild variables needed to get CoreCLR features to be set properly. -->
127127
<PropertyGroup>
128128
<ClrProduct>core_clr</ClrProduct>
129129
<BuildForCoreSystem>true</BuildForCoreSystem>
130-
130+
131131
<!-- These are needed by BCLRewriter -->
132132
<_BuildType Condition="'$(Configuration)' == 'Debug'">chk</_BuildType>
133133
<_BuildType Condition="'$(Configuration)' == 'Checked'">chk</_BuildType>
@@ -137,7 +137,7 @@
137137
<TargetArch Condition="'$(Platform)'=='x86'">i386</TargetArch>
138138
<TargetArch Condition="'$(Platform)'!='x86'">$(Platform)</TargetArch>
139139
</PropertyGroup>
140-
140+
141141
<!-- CLR Features -->
142142
<Import Project="$(MSBuildThisFileDirectory)..\..\clr.coreclr.props" />
143143
<Import Project="$(MSBuildThisFileDirectory)..\..\clr.defines.targets" />
@@ -162,7 +162,7 @@
162162
<Compile Include="@(MscorlibSources)">
163163
</Compile>
164164
</ItemGroup>
165-
165+
166166
<!-- Resources -->
167167
<ItemGroup>
168168
<SplitTextStringResource Include="$(BclSourcesRoot)\mscorlib.txt">
@@ -179,7 +179,7 @@
179179
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
180180

181181
<PropertyGroup>
182-
<StrongNameSig>Silverlight</StrongNameSig>
182+
<StrongNameSig>SilverlightCert121</StrongNameSig>
183183
</PropertyGroup>
184184

185185
<!-- Import signing tools -->

‎src/mscorlib/ref/mscorlib.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
<OutputType>Library</OutputType>
1616
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
17-
17+
1818
<!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
1919
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
2020
<!-- These prevent the default MsBuild targets from referencing System.dll and mscorlib.dll -->
2121
<NoStdLib>true</NoStdLib>
2222
<NoCompilerStandardLib>true</NoCompilerStandardLib>
23-
23+
2424
<ErrorReport>prompt</ErrorReport>
2525
<Optimize Condition="'$(Optimize)' == ''">true</Optimize>
2626
<CLSCompliant>true</CLSCompliant>
@@ -38,7 +38,7 @@
3838
<PropertyGroup Condition="'$(TargetsUnix)'!='true'">
3939
<DefineConstants>$(DefineConstants);FEATURE_COREFX_GLOBALIZATION;FEATURE_COMINTEROP</DefineConstants>
4040
</PropertyGroup>
41-
41+
4242
<!-- Roslyn does not support writing PDBs on Unix -->
4343
<PropertyGroup Condition="'$(OsEnvironment)' == 'Unix'">
4444
<DebugSymbols>false</DebugSymbols>
@@ -68,7 +68,7 @@
6868
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
6969

7070
<PropertyGroup>
71-
<StrongNameSig>Silverlight</StrongNameSig>
71+
<StrongNameSig>SilverlightCert121</StrongNameSig>
7272
</PropertyGroup>
7373

7474
<!-- Import signing tools -->

0 commit comments

Comments
 (0)