From bd33612803f0376ac6126aa01c318ed766783bc4 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Thu, 29 Oct 2020 15:57:15 -0400
Subject: [PATCH] Rename VCarve packages to include major version

these can be installed in parallel, and are therefore essentially separate programs
---
 .../tools/chocolateyInstall.ps1                               | 2 +-
 .../vcarve-pro-makerspace-10.5.nuspec                         | 4 ++--
 .../tools/chocolateyInstall.ps1                               | 2 +-
 .../vcarve-pro-trial-10.5.nuspec                              | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename {vcarve-pro-makerspace => vcarve-pro-makerspace-10.5}/tools/chocolateyInstall.ps1 (93%)
 rename vcarve-pro-makerspace/vcarve-pro-makerspace.nuspec => vcarve-pro-makerspace-10.5/vcarve-pro-makerspace-10.5.nuspec (94%)
 rename {vcarve-pro-trial => vcarve-pro-trial-10.5}/tools/chocolateyInstall.ps1 (94%)
 rename vcarve-pro-trial/vcarve-pro-trial.nuspec => vcarve-pro-trial-10.5/vcarve-pro-trial-10.5.nuspec (95%)

diff --git a/vcarve-pro-makerspace/tools/chocolateyInstall.ps1 b/vcarve-pro-makerspace-10.5/tools/chocolateyInstall.ps1
similarity index 93%
rename from vcarve-pro-makerspace/tools/chocolateyInstall.ps1
rename to vcarve-pro-makerspace-10.5/tools/chocolateyInstall.ps1
index a8a2ce3..cb1740d 100644
--- a/vcarve-pro-makerspace/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-makerspace-10.5/tools/chocolateyInstall.ps1
@@ -1,4 +1,4 @@
-$packageName = 'vcarve-pro-makerspace'
+$packageName = 'vcarve-pro-makerspace-10.5'
 $installerType = 'exe'
 $silentArgs = '/S'
 $url64 = '\\ucs\software\VCarveProMakerspaceEditionV10507_Setup.exe'
diff --git a/vcarve-pro-makerspace/vcarve-pro-makerspace.nuspec b/vcarve-pro-makerspace-10.5/vcarve-pro-makerspace-10.5.nuspec
similarity index 94%
rename from vcarve-pro-makerspace/vcarve-pro-makerspace.nuspec
rename to vcarve-pro-makerspace-10.5/vcarve-pro-makerspace-10.5.nuspec
index 189a79f..d59160d 100644
--- a/vcarve-pro-makerspace/vcarve-pro-makerspace.nuspec
+++ b/vcarve-pro-makerspace-10.5/vcarve-pro-makerspace-10.5.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <id>vcarve-pro-makerspace</id>
-    <version>10.5.0.7</version>
+    <id>vcarve-pro-makerspace-10.5</id>
+    <version>0.7</version>
     <title>VCarve Pro Makerspace Edition</title>
     <authors>Vectric Ltd</authors>
     <owners>Adam</owners>
diff --git a/vcarve-pro-trial/tools/chocolateyInstall.ps1 b/vcarve-pro-trial-10.5/tools/chocolateyInstall.ps1
similarity index 94%
rename from vcarve-pro-trial/tools/chocolateyInstall.ps1
rename to vcarve-pro-trial-10.5/tools/chocolateyInstall.ps1
index 952601d..6ed8e14 100644
--- a/vcarve-pro-trial/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-trial-10.5/tools/chocolateyInstall.ps1
@@ -1,4 +1,4 @@
-$packageName = 'vcarve-pro-trial'
+$packageName = 'vcarve-pro-trial-10.5'
 $installerType = 'exe'
 $silentArgs = '/S'
 $url64 = '\\ucs\software\VCarveProTrialEditionV10505_Setup.exe'
diff --git a/vcarve-pro-trial/vcarve-pro-trial.nuspec b/vcarve-pro-trial-10.5/vcarve-pro-trial-10.5.nuspec
similarity index 95%
rename from vcarve-pro-trial/vcarve-pro-trial.nuspec
rename to vcarve-pro-trial-10.5/vcarve-pro-trial-10.5.nuspec
index 8c091c4..c6c0eeb 100644
--- a/vcarve-pro-trial/vcarve-pro-trial.nuspec
+++ b/vcarve-pro-trial-10.5/vcarve-pro-trial-10.5.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <id>vcarve-pro-trial</id>
-    <version>10.5.0.5</version>
+    <id>vcarve-pro-trial-10.5</id>
+    <version>0.5</version>
     <title>VCarve Pro Trial</title>
     <authors>Vectric Ltd</authors>
     <owners>Adam</owners>