summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cpp/msbuild/ice.sign.targets27
-rw-r--r--cpp/src/Glacier2/msbuild/glacier2router.vcxproj2
-rw-r--r--cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj2
-rw-r--r--cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj2
-rw-r--r--cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj2
-rw-r--r--cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj2
-rw-r--r--cpp/src/Ice/msbuild/ice/ice.vcxproj2
-rw-r--r--cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj2
-rw-r--r--cpp/src/IceBox/msbuild/icebox/icebox.vcxproj2
-rw-r--r--cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj2
-rw-r--r--cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj2
-rw-r--r--cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj2
-rw-r--r--cpp/src/IceBridge/msbuild/icebridge.vcxproj2
-rw-r--r--cpp/src/IceDB/msbuild/icedb.vcxproj2
-rw-r--r--cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj2
-rw-r--r--cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj2
-rw-r--r--cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj2
-rw-r--r--cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj2
-rw-r--r--cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj2
-rw-r--r--cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj2
-rw-r--r--cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj2
-rw-r--r--cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj2
-rw-r--r--cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj2
-rw-r--r--cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj2
-rw-r--r--cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj2
-rw-r--r--cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj2
-rw-r--r--cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj2
-rw-r--r--cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj2
-rw-r--r--cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj2
-rw-r--r--cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj2
-rw-r--r--cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj2
-rw-r--r--cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj2
-rw-r--r--cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj2
-rw-r--r--cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj2
-rw-r--r--cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj2
-rw-r--r--cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj2
-rw-r--r--cpp/src/IceXML/msbuild/icexml.vcxproj2
-rw-r--r--cpp/src/icegriddb/msbuild/icegriddb.vcxproj2
-rw-r--r--cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj2
-rw-r--r--cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj2
-rw-r--r--cpp/src/slice2cs/msbuild/slice2cs.vcxproj2
-rw-r--r--cpp/src/slice2html/msbuild/slice2html.vcxproj2
-rw-r--r--cpp/src/slice2java/msbuild/slice2java.vcxproj2
-rw-r--r--cpp/src/slice2js/msbuild/slice2js.vcxproj2
-rw-r--r--cpp/src/slice2objc/msbuild/slice2objc.vcxproj2
-rw-r--r--cpp/src/slice2php/msbuild/slice2php.vcxproj2
-rw-r--r--cpp/src/slice2py/msbuild/slice2py.vcxproj2
-rw-r--r--cpp/src/slice2rb/msbuild/slice2rb.vcxproj2
-rw-r--r--csharp/msbuild/ice.sign.targets (renamed from config/ice.sign.targets)19
-rw-r--r--csharp/src/Glacier2/msbuild/glacier2.csproj2
-rw-r--r--csharp/src/Ice/msbuild/ice.csproj2
-rw-r--r--csharp/src/IceBox/msbuild/icebox/icebox.csproj2
-rw-r--r--csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj2
-rw-r--r--csharp/src/IceDiscovery/msbuild/icediscovery.csproj2
-rw-r--r--csharp/src/IceGrid/msbuild/icegrid.csproj2
-rw-r--r--csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj2
-rw-r--r--csharp/src/IcePatch2/msbuild/icepatch2.csproj2
-rw-r--r--csharp/src/IceSSL/msbuild/icessl.csproj2
-rw-r--r--csharp/src/IceStorm/msbuild/icestorm.csproj2
59 files changed, 94 insertions, 66 deletions
diff --git a/cpp/msbuild/ice.sign.targets b/cpp/msbuild/ice.sign.targets
new file mode 100644
index 00000000000..f0ecd17cc6e
--- /dev/null
+++ b/cpp/msbuild/ice.sign.targets
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <TimeStampServer>http://timestamp.digicert.com</TimeStampServer>
+ <SignCommandSHA1>signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(TimeStampServer)</SignCommandSHA1>
+ <SignCommandSHA256>signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /tr $(TimeStampServer) /td sha256 /fd sha256 /as</SignCommandSHA256>
+ <SignTarget>$(OutDir)$(TargetName)$(TargetExt)</SignTarget>
+ </PropertyGroup>
+
+ <Target Name="SignPackage" AfterTargets="Build"
+ Condition="Exists('$(SIGN_CERTIFICATE)') and (!Exists('$(IntDir)sign.log') or $([System.IO.File]::GetLastWriteTime('$(SignTarget)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntDir)sign.log').Ticks))">
+ <Message Text="Signing $(SignTarget)" />
+
+ <Exec Command="$(SignCommandSHA1) $(SignTarget)" EchoOff="yes"/>
+ <Exec Command="$(SignCommandSHA256) $(SignTarget)" EchoOff="yes"
+ Condition="'$(DefaultPlatformToolset)' != 'v100'"/>
+
+ <WriteLinesToFile File = "$(IntDir)sign.log"
+ Encoding = "Unicode"
+ Overwrite = "true"
+ Lines = "Signing $(SignTarget)"/>
+ </Target>
+
+ <Target Name="SignPackageClean" AfterTargets="Clean">
+ <Delete Files="$(IntDir)sign.log" />
+ </Target>
+</Project>
diff --git a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
index 58f28c50aa3..4698a8ae50c 100644
--- a/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
+++ b/cpp/src/Glacier2/msbuild/glacier2router.vcxproj
@@ -170,7 +170,7 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj
index 71f1da4f19e..ddef63c2756 100644
--- a/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/msbuild/glacier2cryptpermissionsverifier.vcxproj
@@ -107,5 +107,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
index 68a33ea2840..31afa92f988 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2++11/glacier2++11.vcxproj
@@ -398,7 +398,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
index e8ef47d3af1..d3c26a6fa82 100644
--- a/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
+++ b/cpp/src/Glacier2Lib/msbuild/glacier2/glacier2.vcxproj
@@ -404,7 +404,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
index c1fd866835f..b829beb9153 100644
--- a/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
+++ b/cpp/src/Ice/msbuild/ice++11/ice++11.vcxproj
@@ -1765,7 +1765,7 @@
<Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.9\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.9\build\native\bzip2.v140.targets')" />
<Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.9\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.9\build\native\bzip2.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/Ice/msbuild/ice/ice.vcxproj b/cpp/src/Ice/msbuild/ice/ice.vcxproj
index 5f46412df73..9254b1fd258 100644
--- a/cpp/src/Ice/msbuild/ice/ice.vcxproj
+++ b/cpp/src/Ice/msbuild/ice/ice.vcxproj
@@ -1775,7 +1775,7 @@
<Import Project="..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.9\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v140.1.0.6.9\build\native\bzip2.v140.targets')" />
<Import Project="..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.9\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\bzip2.v141.1.0.6.9\build\native\bzip2.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj
index bfd319e19e6..4a33e9fe528 100644
--- a/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj
+++ b/cpp/src/IceBox/msbuild/icebox++11/icebox++11.vcxproj
@@ -79,5 +79,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
index af41740fddc..f1f0e47f763 100644
--- a/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
+++ b/cpp/src/IceBox/msbuild/icebox/icebox.vcxproj
@@ -82,5 +82,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
index 9473fcc77f3..7b6a1069efd 100644
--- a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
+++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj
@@ -78,5 +78,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj
index 67e127d9351..a7ee309a810 100644
--- a/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj
+++ b/cpp/src/IceBox/msbuild/iceboxlib++11/iceboxlib++11.vcxproj
@@ -158,7 +158,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
index bd0d8265bdc..310d1d78f67 100644
--- a/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
+++ b/cpp/src/IceBox/msbuild/iceboxlib/iceboxlib.vcxproj
@@ -161,7 +161,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceBridge/msbuild/icebridge.vcxproj b/cpp/src/IceBridge/msbuild/icebridge.vcxproj
index e8f3060c754..9d43a4f95bb 100644
--- a/cpp/src/IceBridge/msbuild/icebridge.vcxproj
+++ b/cpp/src/IceBridge/msbuild/icebridge.vcxproj
@@ -101,7 +101,7 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceDB/msbuild/icedb.vcxproj b/cpp/src/IceDB/msbuild/icedb.vcxproj
index 8d4a074a2f7..f4943f9dee9 100644
--- a/cpp/src/IceDB/msbuild/icedb.vcxproj
+++ b/cpp/src/IceDB/msbuild/icedb.vcxproj
@@ -120,7 +120,7 @@
<Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj
index 72b61e0a232..92cbdea002e 100644
--- a/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj
+++ b/cpp/src/IceDiscovery/msbuild/icediscovery++11/icediscovery++11.vcxproj
@@ -150,7 +150,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
index 2be31abb469..7431ba11b20 100644
--- a/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
+++ b/cpp/src/IceDiscovery/msbuild/icediscovery/icediscovery.vcxproj
@@ -157,7 +157,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj
index e71d6b08d27..35ae3295954 100644
--- a/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj
+++ b/cpp/src/IceGrid/msbuild/icegridadmin/icegridadmin.vcxproj
@@ -157,7 +157,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj
index 6fe08a404d6..39f86794e49 100644
--- a/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj
+++ b/cpp/src/IceGrid/msbuild/icegridnode/icegridnode.vcxproj
@@ -252,7 +252,7 @@
<Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
<Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj
index d812d729d5c..e12f01da163 100644
--- a/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj
+++ b/cpp/src/IceGrid/msbuild/icegridregistry/icegridregistry.vcxproj
@@ -246,7 +246,7 @@
<Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
<Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
index 459ff7c56d6..706bf37e3e7 100644
--- a/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
+++ b/cpp/src/IceGridLib/msbuild/icegrid++11/icegrid++11.vcxproj
@@ -439,7 +439,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
index f3959948653..dfa1a73d305 100644
--- a/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
+++ b/cpp/src/IceGridLib/msbuild/icegrid/icegrid.vcxproj
@@ -446,7 +446,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj
index d71b6ddf883..a535a8db915 100644
--- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj
@@ -146,7 +146,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
index 0444dbfdcbb..26f1428c7ea 100644
--- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
+++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj
@@ -153,7 +153,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj
index 2385ffb25f6..feb497ee082 100644
--- a/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj
+++ b/cpp/src/IcePatch2/msbuild/icepatch2calc/icepatch2calc.vcxproj
@@ -70,5 +70,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj
index c535c0b6abe..4dfc75def82 100644
--- a/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj
+++ b/cpp/src/IcePatch2/msbuild/icepatch2client/icepatch2client.vcxproj
@@ -70,5 +70,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj
index 0cd0d9052ab..4928da444f4 100644
--- a/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj
+++ b/cpp/src/IcePatch2/msbuild/icepatch2server/icepatch2server.vcxproj
@@ -74,5 +74,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
index 496e9a1f4b0..454d5fd00cd 100644
--- a/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
+++ b/cpp/src/IcePatch2Lib/msbuild/icepatch2.vcxproj
@@ -204,7 +204,7 @@
<Import Project="..\..\..\msbuild\packages\bzip2.v140.1.0.6.9\build\native\bzip2.v140.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v140.1.0.6.9\build\native\bzip2.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\bzip2.v141.1.0.6.9\build\native\bzip2.v141.targets" Condition="Exists('..\..\..\msbuild\packages\bzip2.v141.1.0.6.9\build\native\bzip2.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
index 41fbe3e81c4..9a5241a64d2 100644
--- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj
@@ -269,7 +269,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
index 295aa359e79..62dd984f625 100644
--- a/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icessl/icessl.vcxproj
@@ -277,7 +277,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj
index 8df1906d289..3999690f1bb 100644
--- a/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icesslopenssl++11/icesslopenssl++11.vcxproj
@@ -112,7 +112,7 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj
index 734443e3964..9004176762b 100644
--- a/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj
+++ b/cpp/src/IceSSL/msbuild/icesslopenssl/icesslopenssl.vcxproj
@@ -118,7 +118,7 @@
<Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.4\build\native\zeroc.openssl.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v120.1.0.2.4\build\native\zeroc.openssl.v120.targets')" />
<Import Project="..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.openssl.v140.1.0.2.4\build\native\zeroc.openssl.v140.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj
index a0e771400c9..80c1d5627e3 100644
--- a/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj
+++ b/cpp/src/IceStorm/msbuild/icestormadmin/icestormadmin.vcxproj
@@ -352,7 +352,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj
index 2c9877ac452..b0ce2543188 100644
--- a/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj
+++ b/cpp/src/IceStorm/msbuild/icestormdb/icestormdb.vcxproj
@@ -232,7 +232,7 @@
<Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
<Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj
index 9a191cbf882..91af8662b2f 100644
--- a/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj
+++ b/cpp/src/IceStorm/msbuild/icestormservice/icestormservice.vcxproj
@@ -385,7 +385,7 @@
<Import Project="..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
<Import Project="..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
index 9056bb954bc..2062f60d8ec 100644
--- a/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
+++ b/cpp/src/IceStormLib/msbuild/icestorm++11/icestorm++11.vcxproj
@@ -184,7 +184,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
index b6f0f82e0e1..251aafcd111 100644
--- a/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
+++ b/cpp/src/IceStormLib/msbuild/icestorm/icestorm.vcxproj
@@ -187,7 +187,7 @@
<Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/IceXML/msbuild/icexml.vcxproj b/cpp/src/IceXML/msbuild/icexml.vcxproj
index 6abf5183ce0..b2abfeac75f 100644
--- a/cpp/src/IceXML/msbuild/icexml.vcxproj
+++ b/cpp/src/IceXML/msbuild/icexml.vcxproj
@@ -100,7 +100,7 @@
<Import Project="..\..\..\msbuild\packages\expat.v140.2.1.0.6\build\native\expat.v140.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v140.2.1.0.6\build\native\expat.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\expat.v141.2.1.0.6\build\native\expat.v141.targets" Condition="Exists('..\..\..\msbuild\packages\expat.v141.2.1.0.6\build\native\expat.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
index 00bf7fdd374..0a0abd1a23b 100644
--- a/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
+++ b/cpp/src/icegriddb/msbuild/icegriddb.vcxproj
@@ -242,7 +242,7 @@
<Import Project="..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v140.0.9.19.3\build\native\lmdb.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets" Condition="Exists('..\..\..\msbuild\packages\lmdb.v141.0.9.19.3\build\native\lmdb.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj
index 24ebe885c66..1e3dff9878d 100644
--- a/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj
+++ b/cpp/src/iceserviceinstall/msbuild/iceserviceinstall.vcxproj
@@ -109,5 +109,5 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
index a42ad76d251..95e3b5e8beb 100644
--- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
+++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
@@ -129,7 +129,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
index 0b4e88298eb..c1e619f615d 100644
--- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
+++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
@@ -137,7 +137,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj b/cpp/src/slice2html/msbuild/slice2html.vcxproj
index 001812589db..e4237126d8e 100644
--- a/cpp/src/slice2html/msbuild/slice2html.vcxproj
+++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj
@@ -133,7 +133,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj
index 102c618f7c3..e1db8bdf61f 100644
--- a/cpp/src/slice2java/msbuild/slice2java.vcxproj
+++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj
@@ -134,7 +134,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj
index 96da9fffa61..431724aafae 100644
--- a/cpp/src/slice2js/msbuild/slice2js.vcxproj
+++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj
@@ -134,7 +134,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
index 748d83341b5..7434f29820f 100644
--- a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
+++ b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj
@@ -134,7 +134,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj
index 30a4e50268b..f63c8bc250e 100644
--- a/cpp/src/slice2php/msbuild/slice2php.vcxproj
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -125,7 +125,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj
index 81abcd98368..2afe29b125e 100644
--- a/cpp/src/slice2py/msbuild/slice2py.vcxproj
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -125,7 +125,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
index a832210a0bb..844d83a5532 100644
--- a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
+++ b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
@@ -124,7 +124,7 @@
<Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" />
<Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" />
</ImportGroup>
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
diff --git a/config/ice.sign.targets b/csharp/msbuild/ice.sign.targets
index e7ddbb2d18a..ed36ce7a2ec 100644
--- a/config/ice.sign.targets
+++ b/csharp/msbuild/ice.sign.targets
@@ -4,20 +4,21 @@
<TimeStampServer>http://timestamp.digicert.com</TimeStampServer>
<SignCommandSHA1>signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(TimeStampServer)</SignCommandSHA1>
<SignCommandSHA256>signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /tr $(TimeStampServer) /td sha256 /fd sha256 /as</SignCommandSHA256>
+ <SignTarget>$(IntermediateOutputPath)$(TargetName)$(TargetExt)</SignTarget>
</PropertyGroup>
- <Target Name="SignPackage" AfterTargets="Build"
- Condition="Exists('$(SIGN_CERTIFICATE)') and (!Exists('$(IntDir)sign.log') or $([System.IO.File]::GetLastWriteTime('$(OutDir)$(TargetName)$(TargetExt)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntDir)sign.log').Ticks))">
- <Message Text="Signing $(TargetName)$(TargetExt)" />
+ <Target Name="SignPackage" AfterTargets="AfterCompile"
+ Condition="Exists('$(SIGN_CERTIFICATE)') and (!Exists('$(IntDir)sign.log') or $([System.IO.File]::GetLastWriteTime('$(SignTarget)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntDir)sign.log').Ticks))">
+ <Message Text="Signing $(SignTarget)" />
- <Exec Command="$(SignCommandSHA1) $(OutDir)$(TargetName)$(TargetExt)" EchoOff="yes"/>
- <Exec Command="$(SignCommandSHA256) $(OutDir)$(TargetName)$(TargetExt)" EchoOff="yes"
+ <Exec Command="$(SignCommandSHA1) $(SignTarget)" EchoOff="yes"/>
+ <Exec Command="$(SignCommandSHA256) $(SignTarget)" EchoOff="yes"
Condition="'$(DefaultPlatformToolset)' != 'v100'"/>
<WriteLinesToFile File = "$(IntDir)sign.log"
Encoding = "Unicode"
Overwrite = "true"
- Lines = "Signing $(TargetName)$(TargetExt)"/>
+ Lines = "Signing $(SignTarget)"/>
</Target>
<Target Name="SignPackageClean" AfterTargets="Clean">
@@ -37,8 +38,8 @@
</PropertyGroup>
<!-- If both KEYFILE and PUBLIC_KEYFILE are set we sign the assembly after it has been build using KEYFILE -->
- <Target Name="StrongNameSignPackage" AfterTargets="Build" BeforeTargets="SignPackage"
- Condition="'$(IceBuilderCsharpProps)' != '' And '$(KEYFILE)' != '' And '$(PUBLIC_KEYFILE)' != ''">
- <Exec Command="sn -Ra $(OutDir)$(TargetName)$(TargetExt) $(KEYFILE)"/>
+ <Target Name="StrongNameSignPackage" BeforeTargets="SignPackage"
+ Condition="'$(IceBuilderCsharpProps)' != '' And '$(KEYFILE)' != '' And '$(PUBLIC_KEYFILE)' != '' and (!Exists('$(IntDir)sign.log') or $([System.IO.File]::GetLastWriteTime('$(SignTarget)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(IntDir)sign.log').Ticks))">
+ <Exec Command="sn -Ra $(SignTarget) $(KEYFILE)"/>
</Target>
</Project>
diff --git a/csharp/src/Glacier2/msbuild/glacier2.csproj b/csharp/src/Glacier2/msbuild/glacier2.csproj
index 2bfdcb84ca8..942a5d702f2 100644
--- a/csharp/src/Glacier2/msbuild/glacier2.csproj
+++ b/csharp/src/Glacier2/msbuild/glacier2.csproj
@@ -83,7 +83,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/Ice/msbuild/ice.csproj b/csharp/src/Ice/msbuild/ice.csproj
index ed21534e3fc..c85e02da0e4 100644
--- a/csharp/src/Ice/msbuild/ice.csproj
+++ b/csharp/src/Ice/msbuild/ice.csproj
@@ -464,7 +464,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceBox/msbuild/icebox/icebox.csproj b/csharp/src/IceBox/msbuild/icebox/icebox.csproj
index 4363a263b70..067e54d6023 100644
--- a/csharp/src/IceBox/msbuild/icebox/icebox.csproj
+++ b/csharp/src/IceBox/msbuild/icebox/icebox.csproj
@@ -53,7 +53,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.common.targets" />
<!-- Generate iceboxnet.exe.config with the correct assembly pulbic key token and
assembly paths -->
diff --git a/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj b/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj
index d161f13b9a0..50477702c49 100644
--- a/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj
+++ b/csharp/src/IceBox/msbuild/iceboxlib/iceboxlib.csproj
@@ -47,7 +47,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceDiscovery/msbuild/icediscovery.csproj b/csharp/src/IceDiscovery/msbuild/icediscovery.csproj
index 89ea1449060..9880c1c42a2 100644
--- a/csharp/src/IceDiscovery/msbuild/icediscovery.csproj
+++ b/csharp/src/IceDiscovery/msbuild/icediscovery.csproj
@@ -56,7 +56,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceGrid/msbuild/icegrid.csproj b/csharp/src/IceGrid/msbuild/icegrid.csproj
index 247957019a4..ca77df8adb4 100644
--- a/csharp/src/IceGrid/msbuild/icegrid.csproj
+++ b/csharp/src/IceGrid/msbuild/icegrid.csproj
@@ -80,7 +80,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj b/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj
index ba547df8c4b..b9725f04b8c 100644
--- a/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj
+++ b/csharp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery.csproj
@@ -50,7 +50,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IcePatch2/msbuild/icepatch2.csproj b/csharp/src/IcePatch2/msbuild/icepatch2.csproj
index 03fd874c9b7..741a1532e97 100644
--- a/csharp/src/IcePatch2/msbuild/icepatch2.csproj
+++ b/csharp/src/IcePatch2/msbuild/icepatch2.csproj
@@ -51,7 +51,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceSSL/msbuild/icessl.csproj b/csharp/src/IceSSL/msbuild/icessl.csproj
index 7a82fcc0bd6..ab4d9644ee2 100644
--- a/csharp/src/IceSSL/msbuild/icessl.csproj
+++ b/csharp/src/IceSSL/msbuild/icessl.csproj
@@ -84,7 +84,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>
diff --git a/csharp/src/IceStorm/msbuild/icestorm.csproj b/csharp/src/IceStorm/msbuild/icestorm.csproj
index a3ac58fb7a0..f8d768f1e6a 100644
--- a/csharp/src/IceStorm/msbuild/icestorm.csproj
+++ b/csharp/src/IceStorm/msbuild/icestorm.csproj
@@ -51,7 +51,7 @@
<IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories>
</PropertyGroup>
<Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" />
- <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
+ <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" />
<Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &amp;gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText>