Making the platform specific package names more .net semantic

pact-foundation · Sep 5, 2017 · 5cdf7cb · 5cdf7cb
1 parent 0a71b7d
commit 5cdf7cb
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 35 deletions.
diff --git a/Build/Publish-StandaloneCore-Releases.ps1 b/Build/Publish-StandaloneCore-Releases.ps1
@@ -5,7 +5,7 @@
 	$ReleaseVersionNumber,
 
 	[switch]$Push,
-	
+
 	[string]$ApiKey
 )
 
@@ -15,12 +15,12 @@ $BuildRoot = Split-Path -Path $PSScriptFilePath -Parent
 $SolutionRoot = Split-Path -Path $BuildRoot -Parent
 $NuGetExe = Join-Path $BuildRoot -ChildPath '..\.nuget\nuget.exe'
 
-$StandaloneCoreReleases = @('PactNet-Windows','PactNet-OSX','PactNet-Linux-x64','PactNet-Linux-x86')
+$StandaloneCoreReleases = @('PactNet.Windows','PactNet.OSX','PactNet.Linux.x64','PactNet.Linux.x86')
 
 foreach ($StandaloneCoreRelease in $StandaloneCoreReleases)
 {
 	# Build the NuGet package
-	$ReleaseSource = $StandaloneCoreRelease.Replace('PactNet-', '').ToLower()
+	$ReleaseSource = $StandaloneCoreRelease.Replace('.', '-').Replace('PactNet-', '').ToLower()
 	$ProjectPath = Join-Path -Path $SolutionRoot -ChildPath "Build\$ReleaseSource\$StandaloneCoreRelease.nuspec"
 	& $NuGetExe pack $ProjectPath -Properties Configuration=Release -OutputDirectory $BuildRoot -Version $ReleaseVersionNumber -NoPackageAnalysis -NoDefaultExcludes
 	if (-not $?)
@@ -44,4 +44,3 @@ foreach ($StandaloneCoreRelease in $StandaloneCoreReleases)
 		}
 	}
 }
-
diff --git a/Build/linux-x64/PactNet-Linux-x64.nuspec → Build/linux-x64/PactNet.Linux.x64.nuspec b/Build/linux-x64/PactNet-Linux-x64.nuspec → Build/linux-x64/PactNet.Linux.x64.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>PactNet-Linux-x64</id>
+    <id>PactNet.Linux.x64</id>
     <version>$version$</version>
     <authors>seek.com.au</authors>
     <owners>seek.com.au</owners>
@@ -16,6 +16,6 @@
   <files>
     <file src="..\tools\pact-linux-x86_64\**" target="tools\pact-linux-x86_64\" />
     <file src="config.json" target="tools\pact-linux-x86_64\config.json" />
-    <file src="PactNet-Linux-x64.targets" target="build\PactNet-Linux-x64.targets" />
+    <file src="PactNet.Linux.x64.targets" target="build\PactNet.Linux.x64.targets" />
   </files>
-</package>
+</package>
diff --git a/Build/linux-x64/PactNet-Linux-x64.targets → Build/linux-x64/PactNet.Linux.x64.targets b/Build/linux-x64/PactNet-Linux-x64.targets → Build/linux-x64/PactNet.Linux.x64.targets
diff --git a/Build/linux-x86/PactNet-Linux-x86.nuspec → Build/linux-x86/PactNet.Linux.x86.nuspec b/Build/linux-x86/PactNet-Linux-x86.nuspec → Build/linux-x86/PactNet.Linux.x86.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>PactNet-Linux-x86</id>
+    <id>PactNet.Linux.x86</id>
     <version>$version$</version>
     <authors>seek.com.au</authors>
     <owners>seek.com.au</owners>
@@ -16,6 +16,6 @@
   <files>
     <file src="..\tools\pact-linux-x86\**" target="tools\pact-linux-x86\" />
     <file src="config.json" target="tools\pact-linux-x86\config.json" />
-    <file src="PactNet-Linux-x86.targets" target="build\PactNet-Linux-x86.targets" />
+    <file src="PactNet.Linux.x86.targets" target="build\PactNet.Linux.x86.targets" />
   </files>
-</package>
+</package>
diff --git a/Build/linux-x86/PactNet-Linux-x86.targets → Build/linux-x86/PactNet.Linux.x86.targets b/Build/linux-x86/PactNet-Linux-x86.targets → Build/linux-x86/PactNet.Linux.x86.targets
diff --git a/Build/osx/PactNet-OSX.nuspec → Build/osx/PactNet.OSX.nuspec b/Build/osx/PactNet-OSX.nuspec → Build/osx/PactNet.OSX.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>PactNet-OSX</id>
+    <id>PactNet.OSX</id>
     <version>$version$</version>
     <authors>seek.com.au</authors>
     <owners>seek.com.au</owners>
@@ -16,6 +16,6 @@
   <files>
     <file src="..\tools\pact-osx\**" target="tools\pact-osx\" />
     <file src="config.json" target="tools\pact-osx\config.json" />
-    <file src="PactNet-OSX.targets" target="build\PactNet-OSX.targets" />
+    <file src="PactNet.OSX.targets" target="build\PactNet.OSX.targets" />
   </files>
-</package>
+</package>
diff --git a/Build/osx/PactNet-OSX.targets → Build/osx/PactNet.OSX.targets b/Build/osx/PactNet-OSX.targets → Build/osx/PactNet.OSX.targets
diff --git a/Build/windows/PactNet-Windows.nuspec → Build/windows/PactNet.Windows.nuspec b/Build/windows/PactNet-Windows.nuspec → Build/windows/PactNet.Windows.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>PactNet-Windows</id>
+    <id>PactNet.Windows</id>
     <version>$version$</version>
     <authors>seek.com.au</authors>
     <owners>seek.com.au</owners>
@@ -16,6 +16,6 @@
   <files>
     <file src="..\tools\pact-win32\**" target="tools\pact-win32\" />
     <file src="config.json" target="tools\pact-win32\config.json" />
-    <file src="PactNet-Windows.targets" target="build\PactNet-Windows.targets" />
+    <file src="PactNet.Windows.targets" target="build\PactNet.Windows.targets" />
   </files>
-</package>
+</package>
diff --git a/Build/windows/PactNet-Windows.targets → Build/windows/PactNet.Windows.targets b/Build/windows/PactNet-Windows.targets → Build/windows/PactNet.Windows.targets
diff --git a/PactNet/Core/PactCoreHost.cs b/PactNet/Core/PactCoreHost.cs
@@ -16,37 +16,37 @@ internal class PactCoreHost<T> : IPactCoreHost where T : IPactCoreHostConfig
         public PactCoreHost(T config)
         {
             _config = config;
-            
+
             var expectedPackage = String.Empty;
 
 #if USE_NET4X
             var pactCoreDir = $"{Constants.BuildDirectory}{Path.DirectorySeparatorChar}"; //OS specific version will be appended
             pactCoreDir += "pact-win32";
-            expectedPackage = "PactNet-Windows";
+            expectedPackage = "PactNet.Windows";
 #else
             var pactCoreDir = $"{Constants.BuildDirectory}{Path.DirectorySeparatorChar}"; //OS specific version will be appended
 
             if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Windows))
             {
                 pactCoreDir += "pact-win32";
-                expectedPackage = "PactNet-Windows";
+                expectedPackage = "PactNet.Windows";
             }
             else if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.OSX))
             {
                 pactCoreDir += "pact-osx";
-                expectedPackage = "PactNet-OSX";
+                expectedPackage = "PactNet.OSX";
             }
             else if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Linux) &&
                 System.Runtime.InteropServices.RuntimeInformation.OSArchitecture == System.Runtime.InteropServices.Architecture.X86)
             {
                 pactCoreDir += "pact-linux-x86";
-                expectedPackage = "PactNet-Linux-x86";
+                expectedPackage = "PactNet.Linux.x86";
             }
             else if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.Linux) &&
                      System.Runtime.InteropServices.RuntimeInformation.OSArchitecture == System.Runtime.InteropServices.Architecture.X64)
             {
                 pactCoreDir += "pact-linux-x86_64";
-                expectedPackage = "PactNet-Linux-x64";
+                expectedPackage = "PactNet.Linux.x64";
             }
             else
             {
@@ -181,9 +181,9 @@ private void WriteToOutputters(string line)
 
         private string ReplaceConfigParams(string input, string pactCoreDir, string script)
         {
-            return !String.IsNullOrEmpty(input) ? 
-                input.Replace("{pactCoreDir}", pactCoreDir).Replace("{script}", script) : 
+            return !String.IsNullOrEmpty(input) ?
+                input.Replace("{pactCoreDir}", pactCoreDir).Replace("{script}", script) :
                 String.Empty;
         }
     }
-}
+}
diff --git a/PactNet/PactNet.nuspec b/PactNet/PactNet.nuspec
@@ -8,7 +8,7 @@
     <licenseUrl>https://github.com/SEEK-Jobs/pact-net/blob/master/LICENSE.txt</licenseUrl>
     <projectUrl>https://github.com/SEEK-Jobs/pact-net</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>A .NET version of Pact, which enables consumer driven contract testing. NOTE: For version 2 and above, you will need to install one of the following Nuget packages, depending on your target platform and architecture: PactNet-Windows, PactNet-OSX, PactNet-Linux-x86 or PactNet-Linux-x64.</description>
+    <description>A .NET version of Pact, which enables consumer driven contract testing. NOTE: For version 2 and above, you will need to install one of the following Nuget packages, depending on your target platform and architecture: PactNet.Windows, PactNet.OSX, PactNet.Linux.x86 or PactNet.Linux.x64.</description>
     <dependencies>
       <group targetFramework="net45">
         <dependency id="Newtonsoft.Json" version="10.0.3" />
@@ -34,4 +34,4 @@
     <file src="bin\Release\net45\PactNet.xml" target="lib\net45" />
     <file src="readme.txt" target="" />
   </files>
-</package>
+</package>
diff --git a/README.md b/README.md
@@ -37,20 +37,20 @@ We have also written some `//NOTE:` comments inline in the code to help explain
 Via Nuget  
 
 **Windows**  
-https://www.nuget.org/packages/PactNet-Windows  
-`Install-Package PactNet-Windows`
+https://www.nuget.org/packages/PactNet.Windows  
+`Install-Package PactNet.Windows`
 
 **OSX**  
-https://www.nuget.org/packages/PactNet-OSX  
-`Install-Package PactNet-OSX`
+https://www.nuget.org/packages/PactNet.OSX  
+`Install-Package PactNet.OSX`
 
 **Linux x64 (64-bit)**  
-https://www.nuget.org/packages/PactNet-Linux-x64  
-`Install-Package PactNet-Linux-x64`
+https://www.nuget.org/packages/PactNet.Linux.x64  
+`Install-Package PactNet.Linux.x64`
 
 **Linux x86 (32-bit)**  
-https://www.nuget.org/packages/PactNet-Linux-x86  
-`Install-Package PactNet-Linux-x86`
+https://www.nuget.org/packages/PactNet.Linux.x86  
+`Install-Package PactNet.Linux.x86`
 
 ### Service Consumer