Fix policy files creation and install

zeroc-ice · Aug 12, 2019 · b24439e · b24439e
1 parent 02e32e7
commit b24439e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 1 deletion.
diff --git a/csharp/config/Make.rules.mak.cs b/csharp/config/Make.rules.mak.cs
@@ -308,7 +308,7 @@ del tmp.publicKeyToken && \
       <dependentAssembly>
         <assemblyIdentity name="$(PKG)" publicKeyToken="$(publicKeyToken)" culture=""/>
         <publisherPolicy apply="yes"/>
-        <bindingRedirect oldVersion="$(SHORT_VERSION).0.0 - $(SHORT_VERSION).1.0" newVersion="$(VERSION).0"/>
+        <bindingRedirect oldVersion="$(SHORT_VERSION).0.0 - $(SHORT_VERSION).4.0" newVersion="$(VERSION).0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/csharp/src/Glacier2/Makefile.mak b/csharp/src/Glacier2/Makefile.mak
@@ -54,6 +54,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/Ice/Makefile.mak b/csharp/src/Ice/Makefile.mak
@@ -189,6 +189,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
@@ -98,6 +98,7 @@ install:: all
 	copy $(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/IceDiscovery/Makefile.mak b/csharp/src/IceDiscovery/Makefile.mak
@@ -49,6 +49,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/IceGrid/Makefile.mak b/csharp/src/IceGrid/Makefile.mak
@@ -55,6 +55,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/IceLocatorDiscovery/Makefile.mak b/csharp/src/IceLocatorDiscovery/Makefile.mak
@@ -47,6 +47,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/IcePatch2/Makefile.mak b/csharp/src/IcePatch2/Makefile.mak
@@ -47,6 +47,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/IceSSL/Makefile.mak b/csharp/src/IceSSL/Makefile.mak
@@ -59,6 +59,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"

diff --git a/csharp/src/IceStorm/Makefile.mak b/csharp/src/IceStorm/Makefile.mak
@@ -47,6 +47,7 @@ install:: all
 	copy $(assembliesdir)\$(LIBNAME) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(PKG).xml "$(install_assembliesdir)"
 !if "$(generate_policies)" == "yes"
+        copy $(assembliesdir)\$(POLICY) "$(install_assembliesdir)"
 	copy $(assembliesdir)\$(POLICY_TARGET) "$(install_assembliesdir)"
 !endif
 !if "$(DEBUG)" == "yes"