Skip to content

Commit 8f571a0

Browse files
MattDaviesMattDavies
committed
Upgrade Azure SDK to 1.8
1 parent 5d24ee9 commit 8f571a0

File tree

8 files changed

+30
-21
lines changed

8 files changed

+30
-21
lines changed

‎AzureWebFarm.OctopusDeploy.Example/AzureWebFarm.OctopusDeploy.Example.ccproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProductVersion>2.2</ProductVersion>
7+
<ProductVersion>2.8</ProductVersion>
88
<ProjectGuid>4457ce61-e327-4c47-b0f8-1fdb4afae451</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
@@ -13,6 +13,7 @@
1313
<StartDevelopmentStorage>True</StartDevelopmentStorage>
1414
<Name>AzureWebFarm.OctopusDeploy.Example</Name>
1515
<PackageEnableRemoteDebugger>False</PackageEnableRemoteDebugger>
16+
<UseEmulatorExpressByDefault>False</UseEmulatorExpressByDefault>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -61,7 +62,7 @@
6162
<!-- Import the target files for this project template -->
6263
<PropertyGroup>
6364
<VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
64-
<CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.2\</CloudExtensionsDir>
65+
<CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.8\</CloudExtensionsDir>
6566
</PropertyGroup>
6667
<Import Project="$(CloudExtensionsDir)Microsoft.WindowsAzure.targets" />
6768
<PropertyGroup>

‎AzureWebFarm.OctopusDeploy.Example/ServiceConfiguration.Cloud.cscfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ServiceConfiguration serviceName="AzureWebFarmOctopus" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="4" osVersion="*" schemaVersion="2013-10.2.2">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ServiceConfiguration serviceName="AzureWebFarmOctopus" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="4" osVersion="*" schemaVersion="2015-04.2.6">
33
<Role name="ExampleWebFarm">
44
<Instances count="1" />
55
<ConfigurationSettings>

‎AzureWebFarm.OctopusDeploy.Example/ServiceConfiguration.Local.cscfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ServiceConfiguration serviceName="AzureWebFarmOctopus" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="4" osVersion="*" schemaVersion="2013-10.2.2">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ServiceConfiguration serviceName="AzureWebFarmOctopus" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="4" osVersion="*" schemaVersion="2015-04.2.6">
33
<Role name="ExampleWebFarm">
44
<Instances count="1" />
55
<ConfigurationSettings>

‎AzureWebFarm.OctopusDeploy.Example/ServiceDefinition.csdef‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ServiceDefinition name="AzureWebFarmOctopus" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2013-10.2.2">
2+
<ServiceDefinition name="AzureWebFarmOctopus" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2015-04.2.6">
33
<WebRole name="ExampleWebFarm" vmsize="Small">
44
<Runtime executionContext="elevated" />
55
<Startup>
@@ -28,7 +28,6 @@
2828
<InputEndpoint name="HTTP" protocol="http" port="80" />
2929
</Endpoints>
3030
<Imports>
31-
<Import moduleName="Diagnostics" />
3231
<Import moduleName="RemoteAccess" />
3332
<Import moduleName="RemoteForwarder" />
3433
</Imports>
@@ -42,6 +41,7 @@
4241
<Setting name="TentacleEnvironment" />
4342
<Setting name="TentacleRole" />
4443
<Setting name="TentacleMachineNameSuffix" />
44+
<Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
4545
</ConfigurationSettings>
4646
</WebRole>
4747
</ServiceDefinition>

‎AzureWebFarm.OctopusDeploy.sln‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
4-
Project("{CC5FD16D-436D-48AD-A40C-5A424C6E3E79}") = "AzureWebFarm.OctopusDeploy.Example", "AzureWebFarm.OctopusDeploy.Example\AzureWebFarm.OctopusDeploy.Example.ccproj", "{4457CE61-E327-4C47-B0F8-1FDB4AFAE451}"
5-
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleWebFarm", "ExampleWebFarm\ExampleWebFarm.csproj", "{46596A51-4879-4896-B27A-844F445E55E7}"
7-
EndProject
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.24720.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
86
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{272569CE-7294-4FC0-9AA6-284372CEABF2}"
97
ProjectSection(SolutionItems) = preProject
108
.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -13,10 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{272569
1311
.nuget\packages.config = .nuget\packages.config
1412
EndProjectSection
1513
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureWebFarm.OctopusDeploy", "AzureWebFarm.OctopusDeploy\AzureWebFarm.OctopusDeploy.csproj", "{52AB44C6-3EB8-4929-8DE0-B24C60B255A7}"
17-
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureWebFarm.OctopusDeploy.Tests", "AzureWebFarm.OctopusDeploy.Tests\AzureWebFarm.OctopusDeploy.Tests.csproj", "{93C7B511-ED6D-46DA-B387-EF7FCC5030A8}"
19-
EndProject
2014
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9A675DE-D79F-416E-8200-53132D9D0031}"
2115
ProjectSection(SolutionItems) = preProject
2216
BREAKING_CHANGES.md = BREAKING_CHANGES.md
@@ -26,6 +20,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2620
README.md = README.md
2721
EndProjectSection
2822
EndProject
23+
Project("{CC5FD16D-436D-48AD-A40C-5A424C6E3E79}") = "AzureWebFarm.OctopusDeploy.Example", "AzureWebFarm.OctopusDeploy.Example\AzureWebFarm.OctopusDeploy.Example.ccproj", "{4457CE61-E327-4C47-B0F8-1FDB4AFAE451}"
24+
EndProject
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleWebFarm", "ExampleWebFarm\ExampleWebFarm.csproj", "{46596A51-4879-4896-B27A-844F445E55E7}"
26+
EndProject
27+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureWebFarm.OctopusDeploy", "AzureWebFarm.OctopusDeploy\AzureWebFarm.OctopusDeploy.csproj", "{52AB44C6-3EB8-4929-8DE0-B24C60B255A7}"
28+
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureWebFarm.OctopusDeploy.Tests", "AzureWebFarm.OctopusDeploy.Tests\AzureWebFarm.OctopusDeploy.Tests.csproj", "{93C7B511-ED6D-46DA-B387-EF7FCC5030A8}"
30+
EndProject
2931
Global
3032
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3133
Debug|Any CPU = Debug|Any CPU

‎AzureWebFarm.OctopusDeploy/AzureWebFarm.OctopusDeploy.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
53+
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<SpecificVersion>False</SpecificVersion>
55+
</Reference>
5456
<Reference Include="Microsoft.WindowsAzure.Storage, Version=2.1.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5557
<SpecificVersion>False</SpecificVersion>
5658
<HintPath>..\packages\WindowsAzure.Storage.2.1.0.3\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>

‎ExampleWebFarm/ExampleWebFarm.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<TargetFrameworkProfile />
2323
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
2424
<RestorePackages>true</RestorePackages>
25+
<UseGlobalApplicationHostFile />
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2728
<DebugSymbols>true</DebugSymbols>
@@ -55,10 +56,10 @@
5556
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5657
<HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
5758
</Reference>
58-
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
59+
<Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
5960
<Private>True</Private>
6061
</Reference>
61-
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
62+
<Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
6263
<Private>False</Private>
6364
</Reference>
6465
<Reference Include="Microsoft.WindowsAzure.Storage, Version=2.1.0.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎ExampleWebFarm/Web.config‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<system.diagnostics>
44
<trace>
55
<listeners>
6-
<add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics" />
6+
<add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
7+
name="AzureDiagnostics">
8+
<filter type="" />
9+
</add>
710
</listeners>
811
</trace>
912
</system.diagnostics>

0 commit comments

Comments
 (0)