From d6e5cba24c0f4ea4792efc175072259c15a55322 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Wed, 24 Jul 2013 12:46:00 +0100 Subject: [PATCH 1/2] CA-111642: Removed the .snk key from the repository. Created a new one and moved it to the build machine. Signed-off-by: Konstantina Chremmou --- csharp/XenServer.NET.snk | Bin 596 -> 0 bytes mk/Makefile | 3 +-- mk/csharp.sh | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 csharp/XenServer.NET.snk diff --git a/csharp/XenServer.NET.snk b/csharp/XenServer.NET.snk deleted file mode 100644 index 01f1f393a95e3b4bd088de8c97c4ada3912844b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098;QLeW7L+>$`B*uQ{y3_Bh%BBJ?kNp#l z6yWqX_(b!S1{QgOP(UT&;XOhsh7O9*fmC}=<9{!1(7X$4jz(ho7TahZ&yDB=rG8YT zfF04qLuss#{153ZLMf+FW!fQX`|ty%(A7kKhBE)}7p{LG<5)qtP?i9>V>m@9ydUQu zmgZZK*gb;95V{fsy5h4BU@af`*Sl!GhPS3m2c-fF)u;+VsRm0}M9I5gO$o48Jy20; z8?&ve%Gr^cYqE4QnqzrJgcc3DNM=xvO}BeZr&xDJyeulF~oGu{c}^-aue)i7`rt z?!6QDE-}f(H)SFhUMo`20=0pNCEjNpzmT}i=T@O-{ur^F+>~#Kx_@`CFAxS-&p^@{ z{yIjiEAr$NHpu?df<3TX`|jB0*J0;B$KrJ;9!3R!)93`(DC}bM!i6v-_CP5(LhACP zG6DX2M6s{XfrzCgJiVdXUe{ZBLpX+28xUX-&KnCFW{-#c5Jlg{`WOhE5 z6_D!UC%qxvGk0bOJa8NX>bSdBw3wj{GS`Ih069V^z-Y>e#h2bM3CV_R)5K>9YzCn< iW;HzC#O?ERRxn*wFpG8689;w?-Sggrw^=fS6L5%qj~VR% diff --git a/mk/Makefile b/mk/Makefile index e4f0d0e..3590963 100644 --- a/mk/Makefile +++ b/mk/Makefile @@ -92,10 +92,9 @@ $(MY_OBJ_DIR)/$(XMLRPC_DLL): $(MY_OBJ_DIR)/csharp_xmlrpc.tar.gz: $(REPO)/mk/sign.bat omake-phase $(MY_OBJ_DIR)/$(XMLRPC_DLL) mkdir -p $(CSHARP_XMLRPC_TMP) cp -r $(CSHARP_SRC_TMP) $(CSHARP_XMLRPC_TMP) - sed -i '/SignAssembly/ i XenServer.NET.snk' $(CSHARP_XMLRPC_TMP)/XenServer.NET/XenServer.csproj + sed -i '/SignAssembly/ i xs.net.snk' $(CSHARP_XMLRPC_TMP)/XenServer.NET/XenServer.csproj cp $< $(CSHARP_XMLRPC_TMP) cp $(MY_OBJ_DIR)/$(XMLRPC_DLL) $(CSHARP_XMLRPC_TMP) - cp $(REPO)/csharp/XenServer.NET.snk $(CSHARP_XMLRPC_TMP)/XenServer.NET tar -C $(CSHARP_XMLRPC_TMP) -zcf $@ . $(MY_OBJ_DIR)/XenServer.dll: $(MY_OBJ_DIR)/csharp_xmlrpc.tar.gz $(REPO)/mk/csharp.sh diff --git a/mk/csharp.sh b/mk/csharp.sh index d5c3f46..7728dbf 100755 --- a/mk/csharp.sh +++ b/mk/csharp.sh @@ -34,6 +34,7 @@ FRAMEWORKDIR="${ROOT}/WINDOWS/Microsoft.NET/Framework/v3.5" MSBUILD="$FRAMEWORKDIR/MSBuild.exe" SDKDIR="${ROOT}/Program Files/Microsoft SDKs/Windows/v6.0A/bin" RESGEN="$SDKDIR/ResGen.exe" +SNK="~/.ssh/xs.net.snk" # see http://www.interact-sw.co.uk/iangblog/2005/09/12/cmdspawnerror SYSPATHS="${ROOT}/WINDOWS/:${ROOT}/WINDOWS/System32:${ROOT}/WINDOWS/System32/wbem" @@ -41,6 +42,7 @@ SYSPATHS="${ROOT}/WINDOWS/:${ROOT}/WINDOWS/System32:${ROOT}/WINDOWS/System32/wbe #SKIP_SIGNING=yes remote_cmd_passwd2 "cd ${TMPDIR}/XenServer.NET/ && \"${RESGEN}\" FriendlyErrorNames.resx /str:cs,XenAPI,FriendlyErrorNames,FriendlyErrorNames.Designer.cs /publicClass" +remote_cmd_passwd2 "cp ${SNK} ${TMPDIR}/XenServer.NET" remote_cmd_passwd2 "cd ${TMPDIR}/XenServer.NET/ && ${MSBUILD} XenServer.csproj /t:Build /p:Configuration=Release" remote_cmd_passwd2 "cp ${TMPDIR}/XenServer.NET/bin/Release/XenServer.dll ${TMPDIR}" remote_cmd_passwd2 "cp ${TMPDIR}/XenServer.NET/FriendlyErrorNames.Designer.cs ${TMPDIR}" From 25c1d700f44ba8b22840e0ec16c788bb9a8f6d7f Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Thu, 25 Jul 2013 17:16:33 +0100 Subject: [PATCH 2/2] CP-5500: Check in change that was left out during previous commit. Signed-off-by: Konstantina Chremmou --- powershell/src/CommonCmdletFunctions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/powershell/src/CommonCmdletFunctions.cs b/powershell/src/CommonCmdletFunctions.cs index 2be5a5f..b863cab 100644 --- a/powershell/src/CommonCmdletFunctions.cs +++ b/powershell/src/CommonCmdletFunctions.cs @@ -44,11 +44,11 @@ class CommonCmdletFunctions { private const string SessionsVariable = "global:Citrix.XenServer.Sessions"; private const string DefaultSessionVariable = "global:XenServer_Default_Session"; - private static string CertificatePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),@"Citrix\XenServerPSSnapIn\XenServer_Known_Certificates.xml"); + private static string CertificatePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),@"WindowsPowerShell\XenServer_Known_Certificates.xml"); static CommonCmdletFunctions() { - Session.UserAgent = string.Format("XenServerPSSnapIn/{0}", Assembly.GetExecutingAssembly().GetName().Version); + Session.UserAgent = string.Format("XenServerPSModule/{0}", Assembly.GetExecutingAssembly().GetName().Version); } internal static Dictionary GetAllSessions(PSCmdlet cmdlet)