Skip to content
This repository was archived by the owner on Feb 19, 2025. It is now read-only.

CA-111642 - removed the .snk key from the repository. CP-5500 - checked in left-out change. #7

Merged
merged 2 commits into from
Jul 25, 2013
Merged

CA-111642 - removed the .snk key from the repository. CP-5500 - checked in left-out change. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e5cba
CA-111642: Removed the .snk key from the repository. Created a new on…
Jul 24, 2013
25c1d70
CP-5500: Check in change that was left out during previous commit.
Jul 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed csharp/XenServer.NET.snk
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions mk/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <AssemblyOriginatorKeyFile>XenServer.NET.snk</AssemblyOriginatorKeyFile>' $(CSHARP_XMLRPC_TMP)/XenServer.NET/XenServer.csproj
sed -i '/SignAssembly/ i <AssemblyOriginatorKeyFile>xs.net.snk</AssemblyOriginatorKeyFile>' $(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
Expand Down
2 changes: 2 additions & 0 deletions mk/csharp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ 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"

#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}"
Expand Down
4 changes: 2 additions & 2 deletions powershell/src/CommonCmdletFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, Session> GetAllSessions(PSCmdlet cmdlet)
Expand Down