diff --git a/.gitignore b/.gitignore index 6cc2834..015c7b7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ NiftySolution/obj/ Shared/bin/ Shared/obj/ *.csproj.user -Build/setup.exe -Build/Nifty*.msi packages -.vs \ No newline at end of file +.vs +Build \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c61d868..0000000 --- a/.travis.yml +++ /dev/null @@ -1,2 +0,0 @@ -language: csharp -solution: NiftyPlugins.sln diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..edd6f10 --- /dev/null +++ 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 index 2d18366..3a95ad5 100644 --- 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 index db3cc15..a9ca1c8 100644 --- a/NiftyPerforce/NiftyPerforce.AddIn +++ b/NiftyPerforce/NiftyPerforce.AddIn @@ -8,6 +8,8 @@ 11.0 12.0 13.0 + 14.0 + 15.0 NiftyPerforce diff --git a/NiftyPerforce/source.extension.vsixmanifest b/NiftyPerforce/source.extension.vsixmanifest index 648f5b9..a7c3ee0 100644 --- a/NiftyPerforce/source.extension.vsixmanifest +++ b/NiftyPerforce/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + NiftyPerforce Simple Perforce integration for Visual Studio https://github.com/jtilander/niftyplugins diff --git a/NiftySolution/AssemblyInfo.cs b/NiftySolution/AssemblyInfo.cs index 0058abc..f7b43ee 100644 --- 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 index 5f92c58..71a5992 100644 Binary files a/NiftySolution/NiftySolution.AddIn and b/NiftySolution/NiftySolution.AddIn differ diff --git a/NiftySolution/source.extension.vsixmanifest b/NiftySolution/source.extension.vsixmanifest index d25e870..ecdb43d 100644 --- a/NiftySolution/source.extension.vsixmanifest +++ b/NiftySolution/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + NiftySolution Nifty Solution https://github.com/jtilander/niftyplugins diff --git a/bin/build.py b/bin/build.py index 3455363..3b7b1bf 100644 --- 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)