Skip to content

Commit 7e2178c

Browse files
committed
Add at least partial support for Visual Studio 2017
Fixed deploy script to generate new versions. Removed travis hooks.
1 parent 2e28a75 commit 7e2178c

File tree

10 files changed

+25
-9
lines changed

10 files changed

+25
-9
lines changed

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ NiftySolution/obj/
66
Shared/bin/
77
Shared/obj/
88
*.csproj.user
9-
Build/setup.exe
10-
Build/Nifty*.msi
119
packages
12-
.vs
10+
.vs
11+
Build

.travis.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
VERSION?=2.0.2
2+
SHELL = cmd.exe
3+
MSBUILD = MSBuild.exe
4+
PATH := $(PATH);C:\Program Files (x86)\MSBuild\14.0\bin\amd64
5+
6+
7+
all: build
8+
9+
build:
10+
cmd /c $(MSBUILD) NiftyPlugins.sln /maxcpucount /nologo /v:m /t:Build /p:Configuration=Release /p:Platform="Any CPU"
11+
12+
clean:
13+
14+
dist:
15+
makedist.cmd $(VERSION)

NiftyPerforce/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// You can specify all the value or you can default the Revision and Build Numbers
2727
// by using the '*' as shown below:
2828

29-
[assembly: AssemblyVersion("2.0.1")]
29+
[assembly: AssemblyVersion("2.0.2")]
3030

3131
//
3232
// In order to sign your assembly you must specify a key to use. Refer to the

NiftyPerforce/NiftyPerforce.AddIn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<Version>11.0</Version>
99
<Version>12.0</Version>
1010
<Version>13.0</Version>
11+
<Version>14.0</Version>
12+
<Version>15.0</Version>
1113
</HostApplication>
1214
<Addin>
1315
<FriendlyName>NiftyPerforce</FriendlyName>

NiftyPerforce/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="NiftyPerforce.Tilander.eb29cef1-a8b5-41b1-922d-6ba8cec91ef4" Version="2.0.1" Language="en-US" Publisher="Jim Tilander" />
4+
<Identity Id="NiftyPerforce.Tilander.eb29cef1-a8b5-41b1-922d-6ba8cec91ef4" Version="2.0.2" Language="en-US" Publisher="Jim Tilander" />
55
<DisplayName>NiftyPerforce</DisplayName>
66
<Description xml:space="preserve">Simple Perforce integration for Visual Studio</Description>
77
<MoreInfo>https://github.com/jtilander/niftyplugins</MoreInfo>

NiftySolution/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// You can specify all the value or you can default the Revision and Build Numbers
2727
// by using the '*' as shown below:
2828

29-
[assembly: AssemblyVersion("2.0.0")]
29+
[assembly: AssemblyVersion("2.0.2")]
3030

3131
//
3232
// In order to sign your assembly you must specify a key to use. Refer to the

NiftySolution/NiftySolution.AddIn

108 Bytes
Binary file not shown.

NiftySolution/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="NiftySolution.Tilander.be9c8024-7476-4508-b3aa-a55095390699" Version="2.0.0" Language="en-US" Publisher="Jim Tilander" />
4+
<Identity Id="NiftySolution.Tilander.be9c8024-7476-4508-b3aa-a55095390699" Version="2.0.2" Language="en-US" Publisher="Jim Tilander" />
55
<DisplayName>NiftySolution</DisplayName>
66
<Description xml:space="preserve">Nifty Solution</Description>
77
<MoreInfo>https://github.com/jtilander/niftyplugins</MoreInfo>

bin/build.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ def updateVersion(versionstring):
139139
replaceText(assembly, r'AssemblyVersion\("([^"]*)"\)', versionstring)
140140

141141
def moveOutputIntoPlace(versionstring):
142+
if not os.path.isdir(TARGET_DIR):
143+
os.makedirs(TARGET_DIR)
142144
for oldname, newprefix in EXPERIMENTAL_FILES:
143145
newname = os.path.join(TARGET_DIR, "%s-%s.vsix" % (newprefix, versionstring))
144146
shutil.copyfile(oldname, newname)

0 commit comments

Comments
 (0)