From b96dd130422f59cb3af6865ab92a860c5ce621bd Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 20 Jun 2018 20:16:21 +0200 Subject: [PATCH] Use PlatformToolset version PlatformToolset>v141 --- build.gradle.win | 12 ++++++------ ...x64.targets => Pocoproject.Poco.v141.x64.targets} | 0 ...x86.targets => Pocoproject.Poco.v141.x86.targets} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename packaging/Windows/NuGet/{Pocoproject.Poco.vs150.x64.targets => Pocoproject.Poco.v141.x64.targets} (100%) rename packaging/Windows/NuGet/{Pocoproject.Poco.vs150.x86.targets => Pocoproject.Poco.v141.x86.targets} (100%) diff --git a/build.gradle.win b/build.gradle.win index afa7cfcc6..e388fc8aa 100644 --- a/build.gradle.win +++ b/build.gradle.win @@ -960,12 +960,12 @@ ext.commonNuspecMetadata = [ task 'nugetSpec-x86'(type: NuGetSpec) { nuspec = [ metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.vs150.x86", - title: "Pocoproject Poco vs150 $version x86", + id: "Pocoproject.Poco.v141.x86", + title: "Pocoproject Poco v141 $version x86", dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x86", version: "1.1.0") } ] ], files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.vs150.x86.targets", target: "build\\native") }, + { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.v141.x86.targets", target: "build\\native") }, { file(src: "$rootDir\\bin\\Poco*.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\lib\\Poco*.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\bin\\Poco*d.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, @@ -995,12 +995,12 @@ task 'nugetSpec-x86'(type: NuGetSpec) { task 'nugetSpec-x64'(type: NuGetSpec) { nuspec = [ metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.vs150.x64", - title: "Pocoproject Poco vs150 $version x64", + id: "Pocoproject.Poco.v141.x64", + title: "Pocoproject Poco v141 $version x64", dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x64", version: "1.1.0") } ] ], files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.vs150.x64.targets", target: "build\\native") }, + { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.v141.x64.targets", target: "build\\native") }, { file(src: "$rootDir\\bin64\\Poco*64.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\lib64\\Poco*.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\bin64\\Poco*64d.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, diff --git a/packaging/Windows/NuGet/Pocoproject.Poco.vs150.x64.targets b/packaging/Windows/NuGet/Pocoproject.Poco.v141.x64.targets similarity index 100% rename from packaging/Windows/NuGet/Pocoproject.Poco.vs150.x64.targets rename to packaging/Windows/NuGet/Pocoproject.Poco.v141.x64.targets diff --git a/packaging/Windows/NuGet/Pocoproject.Poco.vs150.x86.targets b/packaging/Windows/NuGet/Pocoproject.Poco.v141.x86.targets similarity index 100% rename from packaging/Windows/NuGet/Pocoproject.Poco.vs150.x86.targets rename to packaging/Windows/NuGet/Pocoproject.Poco.v141.x86.targets