Skip to content

Commit

Permalink
Merge pull request #25 from IronFoundry/VS-2012
Browse files Browse the repository at this point in the history
Vs 2012
  • Loading branch information
lukebakken committed Dec 11, 2012
2 parents a122885 + d21658d commit 776d27b
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 133 deletions.
30 changes: 15 additions & 15 deletions IronFoundry.sln
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{612435DA-4BBF-49B5-B0AA-36E6529C1D8B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9E04D2BE-86B8-47B9-809D-84506CFDF42D}"
Expand All @@ -14,8 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{698503
LICENSE.txt = LICENSE.txt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry", "src\IronFoundry\IronFoundry.csproj", "{506CCDF4-11FE-4138-8061-25495EEBF8E0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{63D980C4-727A-4473-8BFA-8966B5AF1681}"
ProjectSection(SolutionItems) = preProject
images\cloud_droplet.png = images\cloud_droplet.png
Expand All @@ -31,6 +29,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{63D980
images\server.png = images\server.png
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{443DDB66-F24A-4C73-AA16-9C27DD8B67C8}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{EE6F9E81-B251-47D5-B847-D0EA8957414C}"
ProjectSection(SolutionItems) = preProject
tools\iis_cleanup.ps1 = tools\iis_cleanup.ps1
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry", "src\IronFoundry\IronFoundry.csproj", "{506CCDF4-11FE-4138-8061-25495EEBF8E0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry.Dea", "src\IronFoundry.Dea\IronFoundry.Dea.csproj", "{9E0B2522-39F5-4AC4-BF2F-A7C6B16C9EAA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry.Dea.Service", "src\IronFoundry.Dea.Service\IronFoundry.Dea.Service.csproj", "{8704AF02-615E-4679-B183-FB7164408FA0}"
Expand All @@ -50,17 +61,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "IronFoundry.CloudFoundryExp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronFoundry.Test", "test\IronFoundry.Test\IronFoundry.Test.csproj", "{34013CB7-3FF3-4061-9E45-CB6101F5977A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{443DDB66-F24A-4C73-AA16-9C27DD8B67C8}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{EE6F9E81-B251-47D5-B847-D0EA8957414C}"
ProjectSection(SolutionItems) = preProject
tools\iis_cleanup.ps1 = tools\iis_cleanup.ps1
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down
2 changes: 1 addition & 1 deletion src/IronFoundry.Ui.Controls/Model/CloudFoundryProvider.cs
Expand Up @@ -180,7 +180,7 @@ public ProviderResponse<IEnumerable<Instance>> GetInstances(Cloud cloud, Applica
instance.DiskQuota = stat.Stats.DiskQuota/1048576;
instance.Host = stat.Stats.Host;
instance.Parent = app;
instance.Uptime = TimeSpan.FromSeconds(Convert.ToInt32(stat.Stats.Uptime));
instance.Uptime = TimeSpan.FromSeconds(stat.Stats.Uptime);

if (stat.Stats.Usage != null)
{
Expand Down
Expand Up @@ -152,7 +152,6 @@ private void UpdateApplication(object sender, EventArgs e)
PerformAction("Update Application", project, modelData.SelectedCloud, projectDirectories, (c, d) =>
{
c.Update(modelData.SelectedApplication.Name, d);
c.Restart(new Application {Name = modelData.SelectedApplication.Name});
});
}

Expand Down
208 changes: 104 additions & 104 deletions src/IronFoundry.VisualStudioExtension/CloudFoundryPackage.vsct
@@ -1,104 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<Extern href="stdidcmd.h"/>
<Extern href="vsshlids.h"/>
<Extern href="msobtnid.h"/>
<Commands package="guidCloudFoundryPkg">

<Groups>
<Group guid="guidCloudFoundryCmdSet" id="groupidTools" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS"/>
</Group>
</Groups>

<Buttons>
<Button guid="guidCloudFoundryCmdSet" id="cmdidCloudFoundryExplorer" priority="0x0100" type="Button">
<Icon guid="guidCloudFoundryImages" id="bmpDefault" />
<Strings>
<CommandName>cmdidCloudFoundryExplorer</CommandName>
<ButtonText>Cloud Foundry Explorer...</ButtonText>
</Strings>
</Button>

<Button guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0100" type="Button">
<Icon guid="guidCloudFoundryImages" id="bmpDefault" />
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
<CommandName>cmdidPushCloudFoundryApplication</CommandName>
<ButtonText>Push Cloud Foundry Application...</ButtonText>
</Strings>
</Button>

<Button guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0100" type="Button">
<Icon guid="guidCloudFoundryImages" id="bmpDefault" />
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
<CommandName>cmdidUpdateCloudFoundryApplication</CommandName>
<ButtonText>Update Cloud Foundry Application...</ButtonText>
</Strings>
</Button>

</Buttons>

<Bitmaps>
<Bitmap guid="guidCloudFoundryImages" href="Resources\cloud_play.png"/>
</Bitmaps>

</Commands>

<CommandPlacements>
<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidCloudFoundryExplorer" priority="0x1000">
<Parent guid="guidCloudFoundryCmdSet" id="groupidTools"/>
</CommandPlacement>

<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0600">
<Parent guid="guidVenusCmdId" id="IDG_CTX_BUILD"/>
</CommandPlacement>
<CommandPlacement Condition="!Defined(No_Publish_Commands)" guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD"/>
</CommandPlacement>
<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD"/>
</CommandPlacement>

<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0600">
<Parent guid="guidVenusCmdId" id="IDG_CTX_BUILD"/>
</CommandPlacement>
<CommandPlacement Condition="!Defined(No_Publish_Commands)" guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD"/>
</CommandPlacement>
<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD"/>
</CommandPlacement>

</CommandPlacements>

<VisibilityConstraints>
<VisibilityItem guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" context="UICONTEXT_SolutionExistsAndNotBuildingAndNotDebugging" />
<VisibilityItem guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" context="UICONTEXT_SolutionExistsAndNotBuildingAndNotDebugging" />
</VisibilityConstraints>

<Symbols>
<GuidSymbol name="guidCloudFoundryPkg" value="{D11F588D-A83B-40C1-9637-A5F44B65D110}" />

<GuidSymbol name="guidCloudFoundryCmdSet" value="{05F6013A-8190-4680-9122-69C726FBA0D9}">
<IDSymbol name="groupidTools" value="0x1000"/>
<IDSymbol name="cmdidCloudFoundryExplorer" value="0x0100" />
<IDSymbol name="cmdidPushCloudFoundryApplication" value="0x0200"/>
<IDSymbol name="cmdidUpdateCloudFoundryApplication" value="0x0300"/>
</GuidSymbol>

<GuidSymbol name="guidCloudFoundryImages" value="{582634D0-8365-4960-983B-40CBCF688216}" >
<IDSymbol name="bmpDefault" value="1" />
</GuidSymbol>

<GuidSymbol name="guidVenusCmdId" value="{C7547851-4E3A-4e5b-9173-FA6E9C8BD82C}" >
<IDSymbol name="IDG_CTX_REFERENCE" value="0x0102" />
<IDSymbol name="IDG_CTX_BUILD" value="0x0104"/>
<IDSymbol name="IDG_CTX_PUBLISH" value="0x0103"/>
</GuidSymbol>
<GuidSymbol name="UICONTEXT_SolutionExistsAndNotBuildingAndNotDebugging" value="{D0E4DEEC-1B53-4CDA-8559-D454583AD23B}" />
</Symbols>
</CommandTable>
<?xml version="1.0" encoding="utf-8"?>
<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<Extern href="stdidcmd.h" />
<Extern href="vsshlids.h" />
<!--<Extern href="msobtnid.h" xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" />-->
<Commands package="guidCloudFoundryPkg">

<Groups>
<Group guid="guidCloudFoundryCmdSet" id="groupidTools" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS" />
</Group>
</Groups>

<Buttons>
<Button guid="guidCloudFoundryCmdSet" id="cmdidCloudFoundryExplorer" priority="0x0100" type="Button">
<Icon guid="guidCloudFoundryImages" id="bmpDefault" />
<Strings>
<CommandName>cmdidCloudFoundryExplorer</CommandName>
<ButtonText>Cloud Foundry Explorer...</ButtonText>
</Strings>
</Button>

<Button guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0100" type="Button">
<Icon guid="guidCloudFoundryImages" id="bmpDefault" />
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
<CommandName>cmdidPushCloudFoundryApplication</CommandName>
<ButtonText>Push Cloud Foundry Application...</ButtonText>
</Strings>
</Button>

<Button guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0100" type="Button">
<Icon guid="guidCloudFoundryImages" id="bmpDefault" />
<CommandFlag>DefaultInvisible</CommandFlag>
<CommandFlag>DynamicVisibility</CommandFlag>
<Strings>
<CommandName>cmdidUpdateCloudFoundryApplication</CommandName>
<ButtonText>Update Cloud Foundry Application...</ButtonText>
</Strings>
</Button>

</Buttons>

<Bitmaps>
<Bitmap guid="guidCloudFoundryImages" href="Resources\cloud_play.png" />
</Bitmaps>

</Commands>

<CommandPlacements>
<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidCloudFoundryExplorer" priority="0x1000">
<Parent guid="guidCloudFoundryCmdSet" id="groupidTools" />
</CommandPlacement>

<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0600">
<Parent guid="guidVenusCmdId" id="IDG_CTX_BUILD" />
</CommandPlacement>
<CommandPlacement Condition="!Defined(No_Publish_Commands)" guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD" />
</CommandPlacement>
<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD" />
</CommandPlacement>

<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0600">
<Parent guid="guidVenusCmdId" id="IDG_CTX_BUILD" />
</CommandPlacement>
<CommandPlacement Condition="!Defined(No_Publish_Commands)" guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD" />
</CommandPlacement>
<CommandPlacement guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" priority="0x0600">
<Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_PROJECT_BUILD" />
</CommandPlacement>

</CommandPlacements>

<VisibilityConstraints>
<VisibilityItem guid="guidCloudFoundryCmdSet" id="cmdidPushCloudFoundryApplication" context="UICONTEXT_SolutionExistsAndNotBuildingAndNotDebugging" />
<VisibilityItem guid="guidCloudFoundryCmdSet" id="cmdidUpdateCloudFoundryApplication" context="UICONTEXT_SolutionExistsAndNotBuildingAndNotDebugging" />
</VisibilityConstraints>

<Symbols>
<GuidSymbol name="guidCloudFoundryPkg" value="{D11F588D-A83B-40C1-9637-A5F44B65D110}" />

<GuidSymbol name="guidCloudFoundryCmdSet" value="{05F6013A-8190-4680-9122-69C726FBA0D9}">
<IDSymbol name="groupidTools" value="0x1000" />
<IDSymbol name="cmdidCloudFoundryExplorer" value="0x0100" />
<IDSymbol name="cmdidPushCloudFoundryApplication" value="0x0200" />
<IDSymbol name="cmdidUpdateCloudFoundryApplication" value="0x0300" />
</GuidSymbol>

<GuidSymbol name="guidCloudFoundryImages" value="{582634D0-8365-4960-983B-40CBCF688216}">
<IDSymbol name="bmpDefault" value="1" />
</GuidSymbol>

<GuidSymbol name="guidVenusCmdId" value="{C7547851-4E3A-4e5b-9173-FA6E9C8BD82C}">
<IDSymbol name="IDG_CTX_REFERENCE" value="0x0102" />
<IDSymbol name="IDG_CTX_BUILD" value="0x0104" />
<IDSymbol name="IDG_CTX_PUBLISH" value="0x0103" />
</GuidSymbol>
<GuidSymbol name="UICONTEXT_SolutionExistsAndNotBuildingAndNotDebugging" value="{D0E4DEEC-1B53-4CDA-8559-D454583AD23B}" />
</Symbols>
</CommandTable>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -19,6 +20,12 @@
<ExpressionBlendVersion>4.0.20525.0</ExpressionBlendVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -235,8 +242,13 @@
<PropertyGroup>
<UseCodebase>true</UseCodebase>
</PropertyGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down

0 comments on commit 776d27b

Please sign in to comment.