Skip to content

Commit c7d83ae

Browse files
author
unknown
committed
Fix signing for RTTable
1 parent 8e3e7c2 commit c7d83ae

File tree

8 files changed

+64
-20
lines changed

8 files changed

+64
-20
lines changed

‎microsoft-azure-api/Services/Storage/Lib/DotNet40/DotNet40.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<DebugType>pdbonly</DebugType>
3131
<Optimize>true</Optimize>
3232
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE;DN40CP;DNCP;</DefineConstants>
33+
<DefineConstants>TRACE;DN40CP;DNCP;SIGN</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
3636
<DocumentationFile>bin\Release\Microsoft.WindowsAzure.Storage.xml</DocumentationFile>

‎microsoft-azure-api/Services/Storage/Lib/DotNet40/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
[assembly: AssemblyVersion("2.0.0.0")]
3939
[assembly: AssemblyFileVersion("2.0.3.0")]
4040

41-
#if SIGNED
41+
#if SIGN
4242
[assembly: InternalsVisibleTo(
4343
"Microsoft.WindowsAzure.Storage.Test, PublicKey=" +
4444
"0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67" +

‎microsoft-azure-api/Services/Storage/Lib/RT/Properties/AssemblyInfo.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Reflection;
2+
using System.Resources;
23
using System.Runtime.CompilerServices;
34
using System.Runtime.InteropServices;
45

@@ -27,4 +28,15 @@
2728
[assembly: AssemblyVersion("2.0.0.0")]
2829
[assembly: AssemblyFileVersion("2.0.3.0")]
2930
[assembly: ComVisible(false)]
30-
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Storage.Table")]
31+
#if SIGN
32+
[assembly: InternalsVisibleTo(
33+
"Microsoft.WindowsAzure.Storage.Table, PublicKey=" +
34+
"0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67" +
35+
"871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0b" +
36+
"d333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307" +
37+
"e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c3" +
38+
"08055da9")]
39+
#else
40+
[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Storage.Table")]
41+
#endif
42+
[assembly: NeutralResourcesLanguageAttribute("en-US")]

‎microsoft-azure-api/Services/Storage/Lib/RT/RT.csproj

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<WarningLevel>4</WarningLevel>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<SignAssembly>true</SignAssembly>
28+
<SignAssembly>true</SignAssembly>
2929
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
3030
<DelaySign>true</DelaySign>
3131
<DebugType>pdbonly</DebugType>
3232
<Optimize>true</Optimize>
3333
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE;NETFX_CORE;RTMD;RT</DefineConstants>
34+
<DefineConstants>TRACE;NETFX_CORE;RTMD;RT;SIGN</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
@@ -48,8 +48,11 @@
4848
<Prefer32Bit>true</Prefer32Bit>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
51+
<SignAssembly>true</SignAssembly>
52+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
53+
<DelaySign>true</DelaySign>
5154
<OutputPath>bin\ARM\Release\</OutputPath>
52-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
55+
<DefineConstants>TRACE;NETFX_CORE;SIGN</DefineConstants>
5356
<Optimize>true</Optimize>
5457
<NoWarn>;2008</NoWarn>
5558
<DebugType>pdbonly</DebugType>
@@ -72,8 +75,11 @@
7275
<Prefer32Bit>true</Prefer32Bit>
7376
</PropertyGroup>
7477
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
78+
<SignAssembly>true</SignAssembly>
79+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
80+
<DelaySign>true</DelaySign>
7581
<OutputPath>bin\x64\Release\</OutputPath>
76-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
82+
<DefineConstants>TRACE;NETFX_CORE;SIGN</DefineConstants>
7783
<Optimize>true</Optimize>
7884
<NoWarn>;2008</NoWarn>
7985
<DebugType>pdbonly</DebugType>
@@ -86,7 +92,7 @@
8692
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
8793
<DebugSymbols>true</DebugSymbols>
8894
<OutputPath>bin\x86\Debug\</OutputPath>
89-
<DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
95+
<DefineConstants>DEBUG;TRACE;NETFX_CORE;SIGN</DefineConstants>
9096
<NoWarn>;2008</NoWarn>
9197
<DebugType>full</DebugType>
9298
<PlatformTarget>x86</PlatformTarget>
@@ -96,8 +102,11 @@
96102
<Prefer32Bit>true</Prefer32Bit>
97103
</PropertyGroup>
98104
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
105+
<SignAssembly>true</SignAssembly>
106+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
107+
<DelaySign>true</DelaySign>
99108
<OutputPath>bin\x86\Release\</OutputPath>
100-
<DefineConstants>TRACE;NETFX_CORE;RTMD;RT</DefineConstants>
109+
<DefineConstants>TRACE;NETFX_CORE;RTMD;RT;SIGN</DefineConstants>
101110
<Optimize>true</Optimize>
102111
<NoWarn>;2008</NoWarn>
103112
<DebugType>pdbonly</DebugType>
@@ -295,6 +304,9 @@
295304
<HintPath>Dependencies\System.Spatial.WindowsStore.dll</HintPath>
296305
</Reference>
297306
</ItemGroup>
307+
<ItemGroup>
308+
<None Include="MSSharedLibKey.snk" />
309+
</ItemGroup>
298310
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' ">
299311
<VisualStudioVersion>11.0</VisualStudioVersion>
300312
</PropertyGroup>

‎microsoft-azure-api/Services/Storage/Lib/RTTable/RTTable.csproj

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<WarningLevel>4</WarningLevel>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<SignAssembly>true</SignAssembly>
28+
<SignAssembly>true</SignAssembly>
2929
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
3030
<DelaySign>true</DelaySign>
3131
<DebugType>pdbonly</DebugType>
3232
<Optimize>true</Optimize>
3333
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE;NETFX_CORE;RT;RT_TABLES</DefineConstants>
34+
<DefineConstants>TRACE;NETFX_CORE;RT;RT_TABLES;SIGN</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
@@ -47,8 +47,11 @@
4747
<Prefer32Bit>true</Prefer32Bit>
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
50+
<SignAssembly>true</SignAssembly>
51+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
52+
<DelaySign>true</DelaySign>
5053
<OutputPath>bin\ARM\Release\</OutputPath>
51-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
54+
<DefineConstants>TRACE;NETFX_CORE;SIGN</DefineConstants>
5255
<Optimize>true</Optimize>
5356
<NoWarn>;2008</NoWarn>
5457
<DebugType>pdbonly</DebugType>
@@ -69,8 +72,11 @@
6972
<Prefer32Bit>true</Prefer32Bit>
7073
</PropertyGroup>
7174
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
75+
<SignAssembly>true</SignAssembly>
76+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
77+
<DelaySign>true</DelaySign>
7278
<OutputPath>bin\x64\Release\</OutputPath>
73-
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
79+
<DefineConstants>TRACE;NETFX_CORE;SIGN</DefineConstants>
7480
<Optimize>true</Optimize>
7581
<NoWarn>;2008</NoWarn>
7682
<DebugType>pdbonly</DebugType>
@@ -91,8 +97,11 @@
9197
<Prefer32Bit>true</Prefer32Bit>
9298
</PropertyGroup>
9399
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
100+
<SignAssembly>true</SignAssembly>
101+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
102+
<DelaySign>true</DelaySign>
94103
<OutputPath>bin\x86\Release\</OutputPath>
95-
<DefineConstants>TRACE;NETFX_CORE;RT;RT_TABLES</DefineConstants>
104+
<DefineConstants>TRACE;NETFX_CORE;RT;RT_TABLES;SIGN</DefineConstants>
96105
<Optimize>true</Optimize>
97106
<NoWarn>;2008</NoWarn>
98107
<DebugType>pdbonly</DebugType>
@@ -128,17 +137,12 @@
128137
<Compile Include="..\Common\Table\TableQueryGenericBase.cs" />
129138
</ItemGroup>
130139
<ItemGroup>
140+
<None Include="MSSharedLibKey.snk" />
131141
<None Include="XSCL_RT_Tables_Temporary.snk" />
132142
</ItemGroup>
133143
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
134144
<VisualStudioVersion>11.0</VisualStudioVersion>
135145
</PropertyGroup>
136-
<PropertyGroup>
137-
<SignAssembly>true</SignAssembly>
138-
</PropertyGroup>
139-
<PropertyGroup>
140-
<AssemblyOriginatorKeyFile>XSCL_RT_Tables_Temporary.snk</AssemblyOriginatorKeyFile>
141-
</PropertyGroup>
142146
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
143147
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
144148
Other similar extension points exist, see Microsoft.Common.targets.

‎microsoft-azure-api/Services/Storage/Test/Unit/DotNet40/DotNet40.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<WarningLevel>4</WarningLevel>
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<SignAssembly>true</SignAssembly>
28+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
29+
<DelaySign>true</DelaySign>
2730
<DebugType>pdbonly</DebugType>
2831
<Optimize>true</Optimize>
2932
<OutputPath>bin\Release\</OutputPath>

‎microsoft-azure-api/Services/Storage/Test/Unit/RT/MSSharedLibKey.snk

160 Bytes
Binary file not shown.

‎microsoft-azure-api/Services/Storage/Test/Unit/RT/RT.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<WarningLevel>4</WarningLevel>
2929
</PropertyGroup>
3030
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<SignAssembly>true</SignAssembly>
32+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
33+
<DelaySign>true</DelaySign>
3134
<DebugType>pdbonly</DebugType>
3235
<Optimize>true</Optimize>
3336
<OutputPath>bin\Release\</OutputPath>
@@ -48,6 +51,9 @@
4851
<Prefer32Bit>true</Prefer32Bit>
4952
</PropertyGroup>
5053
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
54+
<SignAssembly>true</SignAssembly>
55+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
56+
<DelaySign>true</DelaySign>
5157
<OutputPath>bin\ARM\Release\</OutputPath>
5258
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
5359
<Optimize>true</Optimize>
@@ -72,6 +78,9 @@
7278
<Prefer32Bit>true</Prefer32Bit>
7379
</PropertyGroup>
7480
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
81+
<SignAssembly>true</SignAssembly>
82+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
83+
<DelaySign>true</DelaySign>
7584
<OutputPath>bin\x64\Release\</OutputPath>
7685
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
7786
<Optimize>true</Optimize>
@@ -96,6 +105,9 @@
96105
<Prefer32Bit>true</Prefer32Bit>
97106
</PropertyGroup>
98107
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
108+
<SignAssembly>true</SignAssembly>
109+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
110+
<DelaySign>true</DelaySign>
99111
<OutputPath>bin\x86\Release\</OutputPath>
100112
<DefineConstants>TRACE;NETFX_CORE</DefineConstants>
101113
<Optimize>true</Optimize>
@@ -199,6 +211,7 @@
199211
<WCFMetadata Include="Service References\" />
200212
</ItemGroup>
201213
<ItemGroup>
214+
<None Include="MSSharedLibKey.snk" />
202215
<None Include="XSCL_RT_Test_TemporaryKey.snk" />
203216
</ItemGroup>
204217
<ItemGroup>

0 commit comments

Comments
 (0)