Add at least partial support for Visual Studio 2017

Fixed deploy script to generate new versions. Removed travis hooks.
jtilander · Mar 11, 2017 · 7e2178c · 7e2178c
1 parent 2e28a75
commit 7e2178c
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ NiftySolution/obj/
 Shared/bin/
 Shared/obj/
 *.csproj.user
-Build/setup.exe
-Build/Nifty*.msi
 packages
-.vs
+.vs
+Build
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -0,0 +1,15 @@
+VERSION?=2.0.2
+SHELL = cmd.exe
+MSBUILD = MSBuild.exe
+PATH := $(PATH);C:\Program Files (x86)\MSBuild\14.0\bin\amd64
+
+
+all: build
+
+build:
+	cmd /c $(MSBUILD) NiftyPlugins.sln /maxcpucount /nologo /v:m /t:Build /p:Configuration=Release /p:Platform="Any CPU"
+
+clean:
+
+dist:
+	makedist.cmd $(VERSION)
diff --git a/NiftyPerforce/AssemblyInfo.cs b/NiftyPerforce/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // You can specify all the value or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.0.1")]
+[assembly: AssemblyVersion("2.0.2")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

diff --git a/NiftyPerforce/NiftyPerforce.AddIn b/NiftyPerforce/NiftyPerforce.AddIn
@@ -8,6 +8,8 @@
 		<Version>11.0</Version>
 		<Version>12.0</Version>
 		<Version>13.0</Version>
+		<Version>14.0</Version>
+		<Version>15.0</Version>
 	</HostApplication>
 	<Addin>
 		<FriendlyName>NiftyPerforce</FriendlyName>

diff --git a/NiftyPerforce/source.extension.vsixmanifest b/NiftyPerforce/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="NiftyPerforce.Tilander.eb29cef1-a8b5-41b1-922d-6ba8cec91ef4" Version="2.0.1" Language="en-US" Publisher="Jim Tilander" />
+    <Identity Id="NiftyPerforce.Tilander.eb29cef1-a8b5-41b1-922d-6ba8cec91ef4" Version="2.0.2" Language="en-US" Publisher="Jim Tilander" />
     <DisplayName>NiftyPerforce</DisplayName>
     <Description xml:space="preserve">Simple Perforce integration for Visual Studio</Description>
     <MoreInfo>https://github.com/jtilander/niftyplugins</MoreInfo>

diff --git a/NiftySolution/AssemblyInfo.cs b/NiftySolution/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // You can specify all the value or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.0.0")]
+[assembly: AssemblyVersion("2.0.2")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

diff --git a/NiftySolution/NiftySolution.AddIn b/NiftySolution/NiftySolution.AddIn
diff --git a/NiftySolution/source.extension.vsixmanifest b/NiftySolution/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="NiftySolution.Tilander.be9c8024-7476-4508-b3aa-a55095390699" Version="2.0.0" Language="en-US" Publisher="Jim Tilander" />
+    <Identity Id="NiftySolution.Tilander.be9c8024-7476-4508-b3aa-a55095390699" Version="2.0.2" Language="en-US" Publisher="Jim Tilander" />
     <DisplayName>NiftySolution</DisplayName>
     <Description xml:space="preserve">Nifty Solution</Description>
     <MoreInfo>https://github.com/jtilander/niftyplugins</MoreInfo>

diff --git a/bin/build.py b/bin/build.py
@@ -139,6 +139,8 @@ def updateVersion(versionstring):
 		replaceText(assembly, r'AssemblyVersion\("([^"]*)"\)', versionstring)
 
 def moveOutputIntoPlace(versionstring):
+	if not os.path.isdir(TARGET_DIR):
+		os.makedirs(TARGET_DIR)
 	for oldname, newprefix in EXPERIMENTAL_FILES:
 		newname = os.path.join(TARGET_DIR, "%s-%s.vsix" % (newprefix, versionstring))
 		shutil.copyfile(oldname, newname)