Switch to VS2017

franiu · Mar 14, 2018 · e7b7444 · e7b7444
1 parent 3317bda
commit e7b7444
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 53 deletions.
diff --git a/build.gradle b/build.gradle
@@ -955,7 +955,7 @@ task nuget(type: Exec) {
 	args "-Version", nugetVersion
 	args "-Symbols"
 	args "-NonInteractive"
-	args "Pocoproject.Poco.vs140.nuspec"
+	args "Pocoproject.Poco.vs150.nuspec"
 
 	inputs.files(pocos.inputs.files)
 	inputs.files(new File(workingDir, "Pocoproject.Poco.vs150.nuspec"))

diff --git a/gradle.properties b/gradle.properties
@@ -43,3 +43,4 @@ ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
 test=-print
 LD_LIBRARY_PATH=
 cpus=
+
diff --git a/packaging/Windows/NuGet/Pocoproject.Poco.vs140.nuspec b/packaging/Windows/NuGet/Pocoproject.Poco.vs140.nuspec
diff --git a/...Get/Pocoproject.Poco.vs140.symbols.nuspec → ...Get/Pocoproject.Poco.vs150.symbols.nuspec b/...Get/Pocoproject.Poco.vs140.symbols.nuspec → ...Get/Pocoproject.Poco.vs150.symbols.nuspec
diff --git a/...dows/NuGet/Pocoproject.Poco.vs140.targets → ...dows/NuGet/Pocoproject.Poco.vs150.targets b/...dows/NuGet/Pocoproject.Poco.vs140.targets → ...dows/NuGet/Pocoproject.Poco.vs150.targets
diff --git a/settings.gradle b/settings.gradle
@@ -42,6 +42,7 @@ if (os.windows) {
 	include ':NetSSL_Win:testsuite'
 }
 include ':SQL:testsuite'
+/*
 if (os.windows) {
 	include ':SQL:ODBC:testsuite'
 	include ':SQL:SQLite:testsuite'
@@ -50,6 +51,7 @@ if (os.windows) {
 }
 //include ':MongoDB:testsuite'
 include ':Redis:testsuite'
+*/
 include ':CppParser:testsuite'
 include ':Zip:testsuite'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,3 +43,4 @@ ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
		test=-print
		LD_LIBRARY_PATH=
		cpus=