Merge pull request NancyFx#2415 from VQComms/certspace

Removed spacing in name of Nancy.Testing.Cert.pfx
sloncho · Apr 18, 2016 · 835372c · 835372c
2 parents bb6e1d0 + f4c2cfa
commit 835372c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj b/src/Nancy.Testing.MSBuild/Nancy.Testing.csproj
@@ -208,8 +208,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Nancy.Testing\Resources\Nancy Testing Cert.pfx">
-      <Link>Resources\Nancy Testing Cert.pfx</Link>
+    <EmbeddedResource Include="..\Nancy.Testing\Resources\NancyTestingCert.pfx">
+      <Link>Resources\NancyTestingCert.pfx</Link>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Nancy.Testing/BrowserContext.cs b/src/Nancy.Testing/BrowserContext.cs
@@ -198,7 +198,7 @@ public void HostName(string hostName)
 
         /// <summary>
         /// Sets the ClientCertificate to a default embedded certificate
-        /// <remarks>The default certificate is embedded using the Nancy.Testing.Nancy Testing Cert.pfx resource name (secured with password "nancy")</remarks>
+        /// <remarks>The default certificate is embedded using the Nancy.Testing.NancyTestingCert.pfx resource name (secured with password "nancy")</remarks>
         /// </summary>
         public void Certificate()
         {
@@ -207,7 +207,7 @@ public void Certificate()
             using (
                 var pkcs12 =
                     Assembly.GetAssembly(typeof (BrowserContext))
-                            .GetManifestResourceStream("Nancy.Testing.Resources.Nancy Testing Cert.pfx"))
+                            .GetManifestResourceStream("Nancy.Testing.Resources.NancyTestingCert.pfx"))
             {
                 using (var br = new BinaryReader(pkcs12))
                 {

diff --git a/src/Nancy.Testing/Properties/Resources.resx b/src/Nancy.Testing/Properties/Resources.resx
@@ -119,6 +119,6 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="NancyTestingCert" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Nancy Testing Cert.pfx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\NancyTestingCert.pfx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
diff --git a/....Testing/Resources/Nancy Testing Cert.pfx → ...cy.Testing/Resources/NancyTestingCert.pfx b/....Testing/Resources/Nancy Testing Cert.pfx → ...cy.Testing/Resources/NancyTestingCert.pfx
diff --git a/src/Nancy.Testing/project.json b/src/Nancy.Testing/project.json
@@ -14,7 +14,7 @@
     },
 
     "resource": [
-        "Resources/Nancy Testing Cert.pfx"
+        "Resources/NancyTestingCert.pfx"
     ],
 
     "frameworks": {