Skip to content

Commit 506c26d

Browse files
kellyroach-optimizelykellyroach-optimizely
authored
Kroach/oasis 1439 sign (#30)
* Bump version number to 1.2.1 * Remove portions of <dependencies> and update <version> . * Update pack.ps1 * Check on 'Delay sign assembly' for all project 'Options' / 'Build' / 'Assembly Signing' * Update third party NuGet package versions. * Built unsigned Optimizely.SDK.1.2.1.nupkg * Revert "Update third party NuGet package versions." This reverts commit ae560b8. * Rebuild Optimizely.SDK.1.2.1.nupkg * Add third party licenses. * Update OptimizelySDK.nuspec and pack.ps1 . * Update pack.ps1 . * Move src 'licenses' subdirectory. * licenses --> Licenses * Add keypair.snk generated by 'sn -k keypair.snk' * Strong sign (sn.exe) Optimizely assemblies with keypair.snk * Use 'Licenses/<NuGet-package-identifier>' * Switch 'murmurhash 1.0.0' to 'murmurhash-signed 1.0.2', add <projectUrl>, rebuild *.nupkg * Add strong naming (sn.exe) calls to pack.ps1 . * Rebuild Optimizely.SDK.1.2.1.nupkg * Update *.nuspec <releaseNotes> * Add *.nuspec <iconUrl> * Rebuild Optimizely.SDK.1.2.1.nupkg * Update CHANGELOG.MD * Update README.md * Add 'Digital Signing (signtool.exe)' to pack.ps1 * Rebuild Optimizely.SDK.1.2.1.nupkg * Rebuild Optimizely.SDK.1.2.1.nupkg * Update CHANGELOG.md * '\lib' --> '.\lib' in pack.ps1 * Add verifysn.ps1 * Update CHANGELOG.md
1 parent e3384b8 commit 506c26d

File tree

35 files changed

+10764
-82
lines changed

35 files changed

+10764
-82
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ publish/
147147
*.publishproj
148148

149149
# NuGet Packages
150-
*.nupkg
150+
# Allow Optimizely built *.nupkg to be checked in.
151+
# *.nupkg
151152
# The packages folder can be ignored because of Package Restore
152153
**/packages/*
153154
# except build/, which is used as an MSBuild target.
@@ -241,4 +242,5 @@ ModelManifest.xml
241242
# FAKE - F# Make
242243
.fake/
243244
OptimizelySDK.Package/nuget.exe
245+
OptimizelySDK.Package/content
244246
OptimizelySDK.Package/lib

‎CHANGELOG.MD renamed to ‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 1.2.1
2+
November 6, 2017
3+
4+
### New Features
5+
* Package DLL's including third party component DLL's are strongnamed and digitally signed by Optimizely.
6+
7+
* DecisionService GetVariationForFeatureRollout added.
8+
9+
* Feature Flag and Rollout models added.
10+
11+
* Implemented Bucketing ID feature.
12+
113
## 1.2.0
214
October 4, 2017
315

‎OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<NuGetPackageImportStamp>
2727
</NuGetPackageImportStamp>
2828
<TargetFrameworkProfile />
29+
<ReleaseVersion>1.2.1</ReleaseVersion>
2930
</PropertyGroup>
3031
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3132
<DebugSymbols>false</DebugSymbols>

‎OptimizelySDK.DemoApp/Properties/AssemblyInfo.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

22+
// Make types and members with internal scope visible to friend
23+
// OptimizelySDK.Tests unit tests.
24+
#pragma warning disable 1700
25+
[assembly: InternalsVisibleTo("OptimizelySDK.Tests, PublicKey=ThePublicKey")]
26+
#pragma warning restore 1700
27+
2228
// The following GUID is for the ID of the typelib if this project is exposed to COM
2329
[assembly: Guid("732a5e33-93e5-476d-af8a-e06279c2d28d")]
2430

@@ -31,5 +37,6 @@
3137
//
3238
// You can specify all the values or you can default the Revision and Build Numbers
3339
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("1.0.0.0")]
35-
[assembly: AssemblyFileVersion("1.0.0.0")]
40+
[assembly: AssemblyVersion("1.2.1.0")]
41+
[assembly: AssemblyFileVersion("1.2.1.0")]
42+
[assembly: AssemblyInformationalVersion("1.2.1")] // Used by Nuget.

‎OptimizelySDK.Net35/OptimizelySDK.Net35.csproj

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<AssemblyName>OptimizelySDK.Net35</AssemblyName>
1212
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<ReleaseVersion>1.2.1</ReleaseVersion>
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>..\keypair.snk</AssemblyOriginatorKeyFile>
1417
</PropertyGroup>
1518
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1619
<DebugSymbols>true</DebugSymbols>
@@ -28,12 +31,17 @@
2831
<DefineConstants>TRACE;NET35</DefineConstants>
2932
<ErrorReport>prompt</ErrorReport>
3033
<WarningLevel>4</WarningLevel>
34+
<CustomCommands>
35+
<CustomCommands>
36+
<Command>
37+
<type>AfterBuild</type>
38+
<command>sn -R "bin/Release/OptimizelySDK.Net35.dll" "../keypair.snk"</command>
39+
<workingdir>${ProjectDir}</workingdir>
40+
</Command>
41+
</CustomCommands>
42+
</CustomCommands>
3143
</PropertyGroup>
3244
<ItemGroup>
33-
<Reference Include="MurmurHash, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\murmurhash.1.0.0\lib\net35\MurmurHash.dll</HintPath>
35-
<Private>True</Private>
36-
</Reference>
3745
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3846
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
3947
</Reference>
@@ -43,6 +51,9 @@
4351
<Reference Include="System.Data.DataSetExtensions" />
4452
<Reference Include="System.Data" />
4553
<Reference Include="System.Xml" />
54+
<Reference Include="MurmurHash">
55+
<HintPath>..\packages\murmurhash-signed.1.0.2\lib\net35\MurmurHash.dll</HintPath>
56+
</Reference>
4657
</ItemGroup>
4758
<ItemGroup>
4859
<Compile Include="..\OptimizelySDK\Entity\Attribute.cs">
@@ -190,4 +201,4 @@
190201
<Target Name="AfterBuild">
191202
</Target>
192203
-->
193-
</Project>
204+
</Project>

‎OptimizelySDK.Net35/Properties/AssemblyInfo.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

22+
// Make types and members with internal scope visible to friend
23+
// OptimizelySDK.Tests unit tests.
24+
#pragma warning disable 1700
25+
[assembly: InternalsVisibleTo("OptimizelySDK.Tests, PublicKey=ThePublicKey")]
26+
#pragma warning restore 1700
27+
2228
// The following GUID is for the ID of the typelib if this project is exposed to COM
2329
[assembly: Guid("c8ff7012-37b7-4d64-ab45-0c62195302ec")]
2430

@@ -32,5 +38,6 @@
3238
// You can specify all the values or you can default the Build and Revision Numbers
3339
// by using the '*' as shown below:
3440
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
41+
[assembly: AssemblyVersion("1.2.1.0")]
42+
[assembly: AssemblyFileVersion("1.2.1.0")]
43+
[assembly: AssemblyInformationalVersion("1.2.1")] // Used by Nuget.

‎OptimizelySDK.Net35/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="murmurhash" version="1.0.0" targetFramework="net35" />
3+
<package id="murmurhash-signed" version="1.0.2" targetFramework="net35" />
44
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" />
5-
</packages>
5+
</packages>

‎OptimizelySDK.Net40/OptimizelySDK.Net40.csproj

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +11,9 @@
1111
<AssemblyName>OptimizelySDK.Net40</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<ReleaseVersion>1.2.1</ReleaseVersion>
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>..\keypair.snk</AssemblyOriginatorKeyFile>
1417
</PropertyGroup>
1518
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1619
<DebugSymbols>true</DebugSymbols>
@@ -28,11 +31,17 @@
2831
<DefineConstants>TRACE;NET35</DefineConstants>
2932
<ErrorReport>prompt</ErrorReport>
3033
<WarningLevel>4</WarningLevel>
34+
<CustomCommands>
35+
<CustomCommands>
36+
<Command>
37+
<type>AfterBuild</type>
38+
<command>sn -R "bin/Release/OptimizelySDK.Net40.dll" "../keypair.snk"</command>
39+
<workingdir>${ProjectDir}</workingdir>
40+
</Command>
41+
</CustomCommands>
42+
</CustomCommands>
3143
</PropertyGroup>
3244
<ItemGroup>
33-
<Reference Include="MurmurHash, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\murmurhash.1.0.0\lib\net40\MurmurHash.dll</HintPath>
35-
</Reference>
3645
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3746
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
3847
</Reference>
@@ -43,6 +52,9 @@
4352
<Reference Include="Microsoft.CSharp" />
4453
<Reference Include="System.Data" />
4554
<Reference Include="System.Xml" />
55+
<Reference Include="MurmurHash">
56+
<HintPath>..\packages\murmurhash-signed.1.0.2\lib\net40\MurmurHash.dll</HintPath>
57+
</Reference>
4658
</ItemGroup>
4759
<ItemGroup>
4860
<Compile Include="..\OptimizelySDK\Entity\Attribute.cs">
@@ -183,4 +195,4 @@
183195
<None Include="packages.config" />
184196
</ItemGroup>
185197
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
186-
</Project>
198+
</Project>

‎OptimizelySDK.Net40/Properties/AssemblyInfo.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

22+
// Make types and members with internal scope visible to friend
23+
// OptimizelySDK.Tests unit tests.
24+
#pragma warning disable 1700
25+
[assembly: InternalsVisibleTo("OptimizelySDK.Tests, PublicKey=ThePublicKey")]
26+
#pragma warning restore 1700
27+
2228
// The following GUID is for the ID of the typelib if this project is exposed to COM
2329
[assembly: Guid("41afd990-bc81-49e3-bd85-40972bb2c262")]
2430

@@ -32,5 +38,6 @@
3238
// You can specify all the values or you can default the Build and Revision Numbers
3339
// by using the '*' as shown below:
3440
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
41+
[assembly: AssemblyVersion("1.2.1.0")]
42+
[assembly: AssemblyFileVersion("1.2.1.0")]
43+
[assembly: AssemblyInformationalVersion("1.2.1")] // Used by Nuget.

‎OptimizelySDK.Net40/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="murmurhash" version="1.0.0" targetFramework="net40" />
3+
<package id="murmurhash-signed" version="1.0.2" targetFramework="net40" />
44
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
5-
</packages>
5+
</packages>

0 commit comments

Comments
 (0)