Merge pull request #257 from Vonage/strong-name

Strong-name Package
Vonage · Oct 26, 2021 · 7a4c3e0 · 7a4c3e0
2 parents f010418 + 041e8d6
commit 7a4c3e0
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 28 deletions.
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -22,3 +22,17 @@ jobs:
           GITHUB_USER_NAME: NexmoDev
           GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com
           OUTPUT_PATH: Vonage/bin/Release
+      - name: Release Nuget
+        uses: nexmo/github-actions/nuget-release@main
+        env:
+          PROJECT_FILE : Vonage/Vonage.csproj          
+          BRANCH: 5.x
+          ORGANIZATION: Vonage
+          REPO: vonage-dotnet-sdk
+          TAG: ${{ github.event.release.tag_name }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+          GITHUB_USER_NAME: NexmoDev
+          GITHUB_EMAIL: 44278943+NexmoDev@users.noreply.github.com
+          OUTPUT_PATH: Vonage/bin/ReleaseSigned
+          CONFIGURATION: ReleaseSigned
diff --git a/Nexmo.Api.Test.Unit/Nexmo.Api.Test.Unit.csproj b/Nexmo.Api.Test.Unit/Nexmo.Api.Test.Unit.csproj
@@ -4,12 +4,17 @@
     <TargetFrameworks>net452;net46;net461;net462;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;net47;net471;net472;net48;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <NoWarn>1701;1702;0618</NoWarn>
     <IsPackable>false</IsPackable>
+    <Configurations>Debug;Release;ReleaseSigned</Configurations>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net461|AnyCPU'">
     <NoWarn>1701;1702;0618</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='ReleaseSigned|net461|AnyCPU'">
+    <NoWarn>1701;1702;0618</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
@@ -22,7 +27,7 @@
     <ProjectReference Include="..\Vonage\Vonage.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.0' And '$(TargetFramework)' != 'netcoreapp3.1' ">
     <Reference Include="System.Web" />
   </ItemGroup>
 

diff --git a/Vonage.Test.Unit/Vonage.Test.Unit.csproj b/Vonage.Test.Unit/Vonage.Test.Unit.csproj
@@ -1,29 +1,40 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFrameworks>net452;net46;net461;net462;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;net47;net471;net472;net48;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
-    <NoWarn>1701;1702;0618</NoWarn>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net461|AnyCPU'">
-    <NoWarn>1701;1702;0618</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
-    <PackageReference Include="coverlet.collector" Version="1.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Vonage\Vonage.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Web" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFrameworks>net452;net46;net461;net462;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;net47;net471;net472;net48;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+		<NoWarn>1701;1702;0618</NoWarn>
+		<IsPackable>false</IsPackable>
+		<Configurations>Debug;Release;ReleaseSigned</Configurations>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net461|AnyCPU'">
+		<NoWarn>1701;1702;0618</NoWarn>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='ReleaseSigned|net461|AnyCPU'">
+		<NoWarn>1701;1702;0618</NoWarn>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='ReleaseSigned|netstandard2.0|AnyCPU'">
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>../vonage.snk</AssemblyOriginatorKeyFile>
+		<DelaySign>false</DelaySign>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+		<PackageReference Include="Moq" Version="4.13.1" />
+		<PackageReference Include="xunit" Version="2.4.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+		<PackageReference Include="coverlet.collector" Version="1.0.1" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\Vonage\Vonage.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.0' And '$(TargetFramework)' != 'netcoreapp3.1' ">
+		<Reference Include="System.Web" />
+	</ItemGroup>
 
 </Project>
diff --git a/Vonage.sln b/Vonage.sln
@@ -26,6 +26,7 @@ Global
 		Release452|Any CPU = Release452|Any CPU
 		Release46|Any CPU = Release46|Any CPU
 		Release461|Any CPU = Release461|Any CPU
+		ReleaseSigned|Any CPU = ReleaseSigned|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{41EF17C9-8D2E-4C7B-B2EE-3BD1A4CC1A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -44,6 +45,8 @@ Global
 		{41EF17C9-8D2E-4C7B-B2EE-3BD1A4CC1A1B}.Release46|Any CPU.Build.0 = Release|Any CPU
 		{41EF17C9-8D2E-4C7B-B2EE-3BD1A4CC1A1B}.Release461|Any CPU.ActiveCfg = Release|Any CPU
 		{41EF17C9-8D2E-4C7B-B2EE-3BD1A4CC1A1B}.Release461|Any CPU.Build.0 = Release|Any CPU
+		{41EF17C9-8D2E-4C7B-B2EE-3BD1A4CC1A1B}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU
+		{41EF17C9-8D2E-4C7B-B2EE-3BD1A4CC1A1B}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU
 		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.net452|Any CPU.ActiveCfg = Debug|Any CPU
@@ -60,6 +63,8 @@ Global
 		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.Release46|Any CPU.Build.0 = Release|Any CPU
 		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.Release461|Any CPU.ActiveCfg = Release|Any CPU
 		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.Release461|Any CPU.Build.0 = Release|Any CPU
+		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU
+		{8BEFC27E-003A-49C3-B399-DDD40D37F024}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU
 		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.net452|Any CPU.ActiveCfg = Release|Any CPU
@@ -76,6 +81,8 @@ Global
 		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.Release46|Any CPU.Build.0 = Release|Any CPU
 		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.Release461|Any CPU.ActiveCfg = Release|Any CPU
 		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.Release461|Any CPU.Build.0 = Release|Any CPU
+		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.ReleaseSigned|Any CPU.ActiveCfg = ReleaseSigned|Any CPU
+		{A3B13068-2D86-4BEE-8CD8-C48F501920AC}.ReleaseSigned|Any CPU.Build.0 = ReleaseSigned|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Vonage/Properties/AssemblyInfo.cs b/Vonage/Properties/AssemblyInfo.cs
@@ -18,8 +18,11 @@
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-
+#if(RELEASESIGNED)
+[assembly: InternalsVisibleTo("Vonage.Test.Unit, PublicKey=dc6dad05b9ecb75a")]
+#else
 [assembly: InternalsVisibleTo("Vonage.Test.Unit")]
+#endif
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("91ab32fe-85ff-4f90-87e9-aad072b21577")]

diff --git a/Vonage/Vonage.csproj b/Vonage/Vonage.csproj
@@ -5,7 +5,6 @@
     <TargetFrameworks>netstandard2.0;net452;net46</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Vonage</AssemblyName>
-    <PackageId>Vonage</PackageId>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">2.0.0</NetStandardImplicitPackageVersion>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -23,6 +22,7 @@
     <PackageTags>SMS voice telephony phone Vonage</PackageTags>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     <NoWarn>1701;1702;1591;1572;1573;0618</NoWarn>
+	<Configurations>Debug;Release;ReleaseSigned</Configurations>
 	<IncludeSymbols>true</IncludeSymbols>
 	<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -38,9 +38,21 @@
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
     <DefineConstants>LIBLOG_PORTABLE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='ReleaseSigned|netstandard2.0|AnyCPU'">
+    <DefineConstants>LIBLOG_PORTABLE</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
 	<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'!='ReleaseSigned'">
+	<PackageId>Vonage</PackageId>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='ReleaseSigned'">
+	<PackageId>Vonage.Signed</PackageId>
+	<SignAssembly>true</SignAssembly>
+	<AssemblyOriginatorKeyFile>../vonage.snk</AssemblyOriginatorKeyFile>
+	<DelaySign>false</DelaySign>	
+  </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />

diff --git a/vonage.snk b/vonage.snk