From 32837db80c9b03732ebacfc2dc68d01c37f52c2e Mon Sep 17 00:00:00 2001
From: anurse <andrew@andrewnurse.net>
Date: Mon, 4 Nov 2013 10:20:54 -0800
Subject: [PATCH] Some minor fixes to make the build work more universally

---
 .nuget/NuGet.targets                          |   1 +
 README.markdown                               |   2 +-
 .../NuGetGallery.Backend.Cloud.ccproj         | 120 +++++++++---------
 .../ServiceConfiguration.Local.cscfg          |   4 +-
 .../ServiceDefinition.csdef                   |   2 +-
 .../NuGetGallery.Backend.csproj               |   4 +-
 .../NuGetGallery.Cloud.ccproj                 |   4 +-
 .../ServiceConfiguration.Local.cscfg          |   4 +-
 .../ServiceDefinition.csdef                   |   4 +-
 .../App_Start/ContainerBindings.cs            |   2 +-
 10 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
index 467fe1b825..721755ec63 100644
--- a/.nuget/NuGet.targets
+++ b/.nuget/NuGet.targets
@@ -18,6 +18,7 @@
     
     <ItemGroup Condition=" '$(PackageSources)' == '' ">
         <PackageSource Include="https://staging.nuget.org/api/v2/" />
+        <PackageSource Include="https://nuget.org/api/v2/" />
     </ItemGroup>
 
     <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
diff --git a/README.markdown b/README.markdown
index bf44af3681..a9f9dcae0a 100644
--- a/README.markdown
+++ b/README.markdown
@@ -9,7 +9,7 @@ website for the NuGet client. For information about the NuGet clients, visit htt
  1. Visual Studio 2012
  2. PowerShell 2.0 (comes with Windows 7+)
  3. [NuGet](http://docs.nuget.org/docs/start-here/installing-nuget)
- 4. [Windows Azure SDK v2.1 or later](http://www.microsoft.com/windowsazure/sdk/)
+ 4. [Windows Azure SDK v2.2](http://www.microsoft.com/windowsazure/sdk/) - Note that later versions may be supported, but will require you to manually upgrade the ".Cloud" projects in the solution.
  5. (Optional, for unit tests) [xUnit for Visual Studio 2012](http://visualstudiogallery.msdn.microsoft.com/463c5987-f82b-46c8-a97e-b1cde42b9099)
 2. Clone it!
     
diff --git a/src/NuGetGallery.Backend.Cloud/NuGetGallery.Backend.Cloud.ccproj b/src/NuGetGallery.Backend.Cloud/NuGetGallery.Backend.Cloud.ccproj
index 5afe5015e9..52e6e1ab97 100644
--- a/src/NuGetGallery.Backend.Cloud/NuGetGallery.Backend.Cloud.ccproj
+++ b/src/NuGetGallery.Backend.Cloud/NuGetGallery.Backend.Cloud.ccproj
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <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>
-        <ProductVersion>2.1</ProductVersion>
-        <ProjectGuid>1d0164b6-92d4-455a-ac68-c30b61733748</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>NuGetGallery.Backend.Cloud</RootNamespace>
-        <AssemblyName>NuGetGallery.Backend.Cloud</AssemblyName>
-        <StartDevelopmentStorage>True</StartDevelopmentStorage>
-        <Name>NuGetGallery.Backend.Cloud</Name>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\NuGetGallery.Backend\NuGetGallery.Backend.csproj">
-            <Name>NuGetGallery.Backend</Name>
-            <Project>{7F92C174-5310-4090-A6A3-3CC7C67C19D6}</Project>
-            <Private>True</Private>
-            <RoleType>Worker</RoleType>
-            <RoleName>NuGetGallery.Backend</RoleName>
-            <UpdateDiagnosticsConnectionStringOnPublish>True</UpdateDiagnosticsConnectionStringOnPublish>
-        </ProjectReference>
-    </ItemGroup>
-    <!-- Items for the project -->
-    <ItemGroup>
-        <ServiceDefinition Include="ServiceDefinition.csdef" />
-        <ServiceConfiguration Include="ServiceConfiguration.Local.cscfg" />
-    </ItemGroup>
-    <ItemGroup>
-        <Folder Include="NuGetGallery.BackendContent\" />
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="NuGetGallery.BackendContent\diagnostics.wadcfg">
-            <SubType>Content</SubType>
-        </Content>
-    </ItemGroup>
-    <!-- Import the target files for this project template -->
-    <PropertyGroup>
-        <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
-        <CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.1\</CloudExtensionsDir>
-    </PropertyGroup>
-    <Import Project="$(CloudExtensionsDir)Microsoft.WindowsAzure.targets" />
-    <Import Project="$(MSBuildProjectDirectory)\..\..\build\NuGetGallery.Cloud.targets" />
+  <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>
+    <ProductVersion>2.2</ProductVersion>
+    <ProjectGuid>1d0164b6-92d4-455a-ac68-c30b61733748</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NuGetGallery.Backend.Cloud</RootNamespace>
+    <AssemblyName>NuGetGallery.Backend.Cloud</AssemblyName>
+    <StartDevelopmentStorage>True</StartDevelopmentStorage>
+    <Name>NuGetGallery.Backend.Cloud</Name>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NuGetGallery.Backend\NuGetGallery.Backend.csproj">
+      <Name>NuGetGallery.Backend</Name>
+      <Project>{7F92C174-5310-4090-A6A3-3CC7C67C19D6}</Project>
+      <Private>True</Private>
+      <RoleType>Worker</RoleType>
+      <RoleName>NuGetGallery.Backend</RoleName>
+      <UpdateDiagnosticsConnectionStringOnPublish>True</UpdateDiagnosticsConnectionStringOnPublish>
+    </ProjectReference>
+  </ItemGroup>
+  <!-- Items for the project -->
+  <ItemGroup>
+    <ServiceDefinition Include="ServiceDefinition.csdef" />
+    <ServiceConfiguration Include="ServiceConfiguration.Local.cscfg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="NuGetGallery.BackendContent\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="NuGetGallery.BackendContent\diagnostics.wadcfg">
+      <SubType>Content</SubType>
+    </Content>
+  </ItemGroup>
+  <!-- Import the target files for this project template -->
+  <PropertyGroup>
+    <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
+    <CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.2\</CloudExtensionsDir>
+  </PropertyGroup>
+  <Import Project="$(CloudExtensionsDir)Microsoft.WindowsAzure.targets" />
+  <Import Project="$(MSBuildProjectDirectory)\..\..\build\NuGetGallery.Cloud.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/NuGetGallery.Backend.Cloud/ServiceConfiguration.Local.cscfg b/src/NuGetGallery.Backend.Cloud/ServiceConfiguration.Local.cscfg
index 9a7b074d32..e0a45ddbf2 100644
--- a/src/NuGetGallery.Backend.Cloud/ServiceConfiguration.Local.cscfg
+++ b/src/NuGetGallery.Backend.Cloud/ServiceConfiguration.Local.cscfg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ServiceConfiguration serviceName="NuGetGallery.Backend.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="3" osVersion="*" schemaVersion="2013-03.2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceConfiguration serviceName="NuGetGallery.Backend.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="3" osVersion="*" schemaVersion="2013-10.2.2">
   <Role name="NuGetGallery.Backend">
     <Instances count="1" />
     <ConfigurationSettings>
diff --git a/src/NuGetGallery.Backend.Cloud/ServiceDefinition.csdef b/src/NuGetGallery.Backend.Cloud/ServiceDefinition.csdef
index 604a9f614a..2980635376 100644
--- a/src/NuGetGallery.Backend.Cloud/ServiceDefinition.csdef
+++ b/src/NuGetGallery.Backend.Cloud/ServiceDefinition.csdef
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ServiceDefinition name="NuGetGallery.Backend.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2013-03.2.0">
+<ServiceDefinition name="NuGetGallery.Backend.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2013-10.2.2">
   <WorkerRole name="NuGetGallery.Backend" vmsize="Medium">
     <ConfigurationSettings>
       <Setting name="Operations.EnvironmentName" />
diff --git a/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj b/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj
index 4d0ff8a4e3..5123bd3dba 100644
--- a/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj
+++ b/src/NuGetGallery.Backend/NuGetGallery.Backend.csproj
@@ -54,10 +54,10 @@
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+    <Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
+    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/NuGetGallery.Cloud/NuGetGallery.Cloud.ccproj b/src/NuGetGallery.Cloud/NuGetGallery.Cloud.ccproj
index f8478cf93b..f5419755c3 100644
--- a/src/NuGetGallery.Cloud/NuGetGallery.Cloud.ccproj
+++ b/src/NuGetGallery.Cloud/NuGetGallery.Cloud.ccproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>2.1</ProductVersion>
+    <ProductVersion>2.2</ProductVersion>
     <ProjectGuid>0041aca0-30ec-4554-8c7c-0af810f3086f</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -63,7 +63,7 @@
   <!-- Import the target files for this project template -->
   <PropertyGroup>
     <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
-    <CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.1\</CloudExtensionsDir>
+    <CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.2\</CloudExtensionsDir>
   </PropertyGroup>
   <Import Project="$(CloudExtensionsDir)Microsoft.WindowsAzure.targets" />
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\NuGetGallery.Cloud.targets" />
diff --git a/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg b/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg
index c4b0196cd9..6a3b368b86 100644
--- a/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg
+++ b/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ServiceConfiguration serviceName="NuGetGallery.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="3" osVersion="*" schemaVersion="2013-03.2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceConfiguration serviceName="NuGetGallery.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" osFamily="3" osVersion="*" schemaVersion="2013-10.2.2">
   <Role name="NuGetGallery">
     <Instances count="1" />
     <ConfigurationSettings>
diff --git a/src/NuGetGallery.Cloud/ServiceDefinition.csdef b/src/NuGetGallery.Cloud/ServiceDefinition.csdef
index 3739048d44..7e9ae51409 100644
--- a/src/NuGetGallery.Cloud/ServiceDefinition.csdef
+++ b/src/NuGetGallery.Cloud/ServiceDefinition.csdef
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ServiceDefinition name="NuGetGallery.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2013-03.2.0">
+<ServiceDefinition name="NuGetGallery.Cloud" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2013-10.2.2">
   <LoadBalancerProbes>
     <LoadBalancerProbe name="HTTP" path="/" protocol="http" port="80" />
   </LoadBalancerProbes>
@@ -56,4 +56,4 @@
       <LocalStorage name="Logs" cleanOnRoleRecycle="false" sizeInMB="2048" />
     </LocalResources>
   </WebRole>
-</ServiceDefinition>
+</ServiceDefinition>
\ No newline at end of file
diff --git a/src/NuGetGallery/App_Start/ContainerBindings.cs b/src/NuGetGallery/App_Start/ContainerBindings.cs
index ab567cb4ef..deb19a3deb 100644
--- a/src/NuGetGallery/App_Start/ContainerBindings.cs
+++ b/src/NuGetGallery/App_Start/ContainerBindings.cs
@@ -129,7 +129,7 @@ public override void Load()
                 () =>
                 {
                     var settings = Kernel.Get<ConfigurationService>();
-                    if (settings.Current.SmtpUri != null)
+                    if (settings.Current.SmtpUri != null && settings.Current.SmtpUri.IsAbsoluteUri)
                     {
                         var smtpUri = new SmtpUri(settings.Current.SmtpUri);