9 files changed, 20 insertions, 2 deletions
diff --git a/csharp/src/Glacier2/Makefile.mak b/csharp/src/Glacier2/Makefile.mak
index 950fca5125a..5a9fd7ab8f1 100755
--- a/csharp/src/Glacier2/Makefile.mak
+++ b/csharp/src/Glacier2/Makefile.mak
@@ -35,12 +35,12 @@ MCSFLAGS	= $(MCSFLAGS) -target:library -out:$(TARGETS) -warnaserror-
 MCSFLAGS	= $(MCSFLAGS) -keyfile:"$(KEYFILE)"
 MCSFLAGS	= $(MCSFLAGS) /doc:$(assembliesdir)\$(PKG).xml /nowarn:1591
 
-# -r:WindowsBase.dll
-
 SLICE2CSFLAGS	= $(SLICE2CSFLAGS) -I$(slicedir) --ice
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) /baseaddress:0x22000000 $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/Ice/Makefile.mak b/csharp/src/Ice/Makefile.mak
index f6c85328dc5..4399b506183 100644
--- a/csharp/src/Ice/Makefile.mak
+++ b/csharp/src/Ice/Makefile.mak
@@ -174,6 +174,8 @@ SLICE2CSFLAGS	= $(SLICE2CSFLAGS) --ice -I"$(slicedir)"
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) /baseaddress:0x20000000 $(MCSFLAGS) $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
index fffd6ae0233..b970f4721bf 100644
--- a/csharp/src/IceBox/Makefile.mak
+++ b/csharp/src/IceBox/Makefile.mak
@@ -38,9 +38,13 @@ SLICE2CSFLAGS	= $(SLICE2CSFLAGS) --checksum --ice -I. -I$(slicedir)
 
 $(ICEBOXNET): $(I_SRCS) $(LIBNAME)
 	$(MCS) $(EXE_MCSFLAGS) -out:$@ -r:$(LIBNAME) -r:$(refdir)\Ice.dll $(I_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 $(LIBNAME): $(L_SRCS) $(GEN_SRCS)
 	$(MCS) /baseaddress:0x25000000 $(LIB_MCSFLAGS) -r:$(refdir)\Ice.dll $(L_SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/IceDiscovery/Makefile.mak b/csharp/src/IceDiscovery/Makefile.mak
index 0260afceba1..1ef6b9d9920 100644
--- a/csharp/src/IceDiscovery/Makefile.mak
+++ b/csharp/src/IceDiscovery/Makefile.mak
@@ -34,6 +34,8 @@ SLICE2CSFLAGS   = $(SLICE2CSFLAGS) --ice -I$(slicedir)
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/IceGrid/Makefile.mak b/csharp/src/IceGrid/Makefile.mak
index f76a1370602..f2664073131 100644
--- a/csharp/src/IceGrid/Makefile.mak
+++ b/csharp/src/IceGrid/Makefile.mak
@@ -40,6 +40,8 @@ SLICE2CSFLAGS	= $(SLICE2CSFLAGS) --ice -I$(slicedir)
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) /baseaddress:0x24000000 $(MCSFLAGS) -r:$(refdir)\Glacier2.dll -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/IceLocatorDiscovery/Makefile.mak b/csharp/src/IceLocatorDiscovery/Makefile.mak
index bd0a9f729d2..c4674688e4f 100644
--- a/csharp/src/IceLocatorDiscovery/Makefile.mak
+++ b/csharp/src/IceLocatorDiscovery/Makefile.mak
@@ -32,6 +32,8 @@ SLICE2CSFLAGS   = $(SLICE2CSFLAGS) --ice -I$(slicedir)
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/IcePatch2/Makefile.mak b/csharp/src/IcePatch2/Makefile.mak
index 2dd8c822309..0d3f55ffda4 100644
--- a/csharp/src/IcePatch2/Makefile.mak
+++ b/csharp/src/IcePatch2/Makefile.mak
@@ -32,6 +32,8 @@ SLICE2CSFLAGS	= $(SLICE2CSFLAGS) -I$(slicedir) --ice
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) /baseaddress:0x23000000 $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/IceSSL/Makefile.mak b/csharp/src/IceSSL/Makefile.mak
index 776891d49c1..eaa44796fe2 100644
--- a/csharp/src/IceSSL/Makefile.mak
+++ b/csharp/src/IceSSL/Makefile.mak
@@ -44,6 +44,8 @@ SLICE2CSFLAGS   = $(SLICE2CSFLAGS) --ice -I$(slicedir)
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::
diff --git a/csharp/src/IceStorm/Makefile.mak b/csharp/src/IceStorm/Makefile.mak
index 7094b571653..39d8a68c0fa 100644
--- a/csharp/src/IceStorm/Makefile.mak
+++ b/csharp/src/IceStorm/Makefile.mak
@@ -32,6 +32,8 @@ SLICE2CSFLAGS	= $(SLICE2CSFLAGS) -I$(slicedir) --ice
 
 $(TARGETS):: $(SRCS) $(GEN_SRCS)
 	$(MCS) /baseaddress:0x21000000 $(MCSFLAGS) -r:$(refdir)\Ice.dll $(SRCS) $(GEN_SRCS)
+	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
+		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
 
 !if "$(DEBUG)" == "yes"
 clean::