remove net40 solution configurations from auto rest based libraries

AzureSDKAutomation · Jul 18, 2015 · b906e7f · b906e7f
1 parent dd9eebf
commit b906e7f
Show file tree

Hide file tree

Showing 20 changed files with 173 additions and 187 deletions.
diff --git a/build.proj b/build.proj
@@ -69,15 +69,16 @@
                       Exclude="$(LibrarySourceFolder)\HDInsight\**\*.sln;$(LibrarySourceFolder)\KeyVault\**\*.sln"
                       Condition=" '$(Scope)' == 'all'  " />
     <LibraryFxTargetList Include="$(FxTargetList)" />
+    <AutoRestLibraryFxTargetList Include="portable;net45" />
   </ItemGroup>
 
   <PropertyGroup>
     <NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
   </PropertyGroup>
 
-  <UsingTask AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" TaskName="RegexReplacementTask" />
-  <UsingTask AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" TaskName="ValidateStrongNameSignatureTask" />
-
+  <UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll"  />
+  <UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll"  />
+  
   <!--
   CI build related
   -->
@@ -91,27 +92,41 @@
   <UsingTask Condition=" $(OnPremiseBuild) " TaskName="CorporateValidation" AssemblyFile="$(CIToolsPath)\Microsoft.WindowsAzure.Tools.Build.Tasks.OnPremise.dll" />
   <Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />
 
-  <Target Name="Build" DependsOnTargets="RestoreNugetPackages">
+  <Target Name="PrepareForAutoRestLibraries">
+    <FilterOutAutoRestLibraries AllLibraries="@(LibrariesToBuild)" AutoRestMark="AutoRestProjects">
+      <Output TaskParameter="AutoRestLibraries" ItemName="AutoRestLibraries" />
+      <Output TaskParameter="NonAutoRestLibraries" ItemName="NonAutoRestLibraries" />
+    </FilterOutAutoRestLibraries>    
+  </Target>
+
+  <Target Name="Build" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask;PrepareForAutoRestLibraries">
     <PropertyGroup>
       <_ExtraPropertyList>CodeSign=$(CodeSign)</_ExtraPropertyList>
     </PropertyGroup>
-    <CallTarget Targets="BuildMsBuildTask" />
     <CallTarget Targets="BuildServerPreparation" Condition=" '$(CodeSign)' == 'true' " />
+
     <!--The solution contains configurations for each platform such as Net40-Debug, Net45-Release, etc
     So when invoke msbuild, feed the right configuration name-->   
-    <MSBuild Projects="@(LibrariesToBuild)"
+    <MSBuild Projects="@(NonAutoRestLibraries)"
              Properties="Configuration=%(LibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU;$(_ExtraPropertyList)"
              Targets="Build" />
 
+    <MSBuild Projects="@(AutoRestLibraries)"
+             Properties="Configuration=%(AutoRestLibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU;$(_ExtraPropertyList)"
+             Targets="Build" />
+
     <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
 
   </Target>
 
-  <Target Name="Clean" DependsOnTargets="RestoreNugetPackages">
-    <MSBuild Projects="@(LibrariesToBuild)"
+  <Target Name="Clean" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask;PrepareForAutoRestLibraries">
+    <MSBuild Projects="@(NonAutoRestLibraries)"
              Properties="Configuration=%(LibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU"
-             Targets="Clean"/>
+             Targets="Clean" />
 
+    <MSBuild Projects="@(AutoRestLibraries)"
+             Properties="Configuration=%(AutoRestLibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU;$(_ExtraPropertyList)"
+             Targets="Clean" />
     <RemoveDir Directories="$(BinariesFolder)" />
   </Target>
 
@@ -122,7 +137,7 @@
        <TestPartialName>$([System.IO.Path]::GetFileName($(Scope)))</TestPartialName>
      </PropertyGroup>
     <ItemGroup>
-      <!--TODO: improve inclue the logic to be more explicit -->
+      <!--TODO: improve the logic to be more explicit -->
       <TestDlls Include=".\src\**\*.Tests\bin\net45-$(Configuration)\*.Tests.dll" Condition=" '$(Scope)' == 'All' " />
       <TestDlls Include=".\src\$(Scope)\*.Tests\bin\net45-$(Configuration)\*$(TestPartialName)*.Tests.dll" 
                 Condition=" '$(Scope)' != 'All' " />

diff --git a/src/ResourceManagement/Compute/Compute.Tests/Compute.Tests.csproj b/src/ResourceManagement/Compute/Compute.Tests/Compute.Tests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <AutoRestProjects>true</AutoRestProjects>
     <SDKTestProject>true</SDKTestProject>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>Library</OutputType>
@@ -154,18 +155,6 @@
       <HintPath>..\..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.1.0.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure">
-      <HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="xunit">
       <HintPath>$(LibraryNugetPackageFolder)\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
     </Reference>

diff --git a/src/ResourceManagement/Compute/Compute.sln b/src/ResourceManagement/Compute/Compute.sln
@@ -15,16 +15,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceManagement", "..\Re
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Net40-Debug|Any CPU = Net40-Debug|Any CPU
-		Net40-Release|Any CPU = Net40-Release|Any CPU
 		Net45-Debug|Any CPU = Net45-Debug|Any CPU
 		Net45-Release|Any CPU = Net45-Release|Any CPU
 		Portable-Debug|Any CPU = Portable-Debug|Any CPU
 		Portable-Release|Any CPU = Portable-Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
@@ -33,32 +29,24 @@ Global
 		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
 		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
-		{3C768CCE-36A0-433E-8280-31979756CC07}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{3C768CCE-36A0-433E-8280-31979756CC07}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{3C768CCE-36A0-433E-8280-31979756CC07}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{3C768CCE-36A0-433E-8280-31979756CC07}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{3C768CCE-36A0-433E-8280-31979756CC07}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
 		{3C768CCE-36A0-433E-8280-31979756CC07}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
 		{3C768CCE-36A0-433E-8280-31979756CC07}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
 		{3C768CCE-36A0-433E-8280-31979756CC07}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
-		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
-		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
 		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
 		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
 		{A7F47B7F-319B-411F-BF33-F57899A430CB}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
-		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU

diff --git a/src/ResourceManagement/Compute/ComputeManagement/ComputeManagement.csproj b/src/ResourceManagement/Compute/ComputeManagement/ComputeManagement.csproj
@@ -2,6 +2,7 @@
 <Project ToolsVersion="12.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>
+    <AutoRestProjects>true</AutoRestProjects>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{4F41C7A2-7DF6-4CC1-9F2D-66E8F05C2331}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -27,22 +28,6 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup Condition=" '$(LibraryFxTarget)' == 'net45' ">
-    <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.1.0.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(LibraryFxTarget)' == 'portable' ">
-    <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.1.0.3\lib\portable-net403+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\portable-net403+win+wpa81\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" Condition=" '$(LibraryFxTarget)' == 'portable' " />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(LibraryFxTarget)' != 'portable' " />
   <Import Project="$(LibraryNugetPackageFolder)\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('$(LibraryNugetPackageFolder)\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

diff --git a/src/ResourceManagement/Network/Network.Tests/Network.Tests.csproj b/src/ResourceManagement/Network/Network.Tests/Network.Tests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <AutoRestProjects>true</AutoRestProjects>
     <SDKTestProject>true</SDKTestProject>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <OutputType>Library</OutputType>
@@ -124,18 +125,6 @@
       <HintPath>..\..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.1.0.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure">
-      <HintPath>..\..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="xunit">
       <HintPath>$(LibraryNugetPackageFolder)\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
     </Reference>

diff --git a/src/ResourceManagement/Network/Network.sln b/src/ResourceManagement/Network/Network.sln
@@ -11,16 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceManagement", "..\Re
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Net40-Debug|Any CPU = Net40-Debug|Any CPU
-		Net40-Release|Any CPU = Net40-Release|Any CPU
 		Net45-Debug|Any CPU = Net45-Debug|Any CPU
 		Net45-Release|Any CPU = Net45-Release|Any CPU
 		Portable-Debug|Any CPU = Portable-Debug|Any CPU
 		Portable-Release|Any CPU = Portable-Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
@@ -29,16 +25,12 @@ Global
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{4500A2D3-C087-4FBC-BEBD-E630CD728788}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
-		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
 		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
 		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
 		{7BC81D11-FB6A-411B-B5CA-3A3EC263B258}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
-		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU

diff --git a/src/ResourceManagement/Network/NetworkManagement/NetworkManagement.csproj b/src/ResourceManagement/Network/NetworkManagement/NetworkManagement.csproj
@@ -2,6 +2,7 @@
 <Project ToolsVersion="12.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>
+    <AutoRestProjects>true</AutoRestProjects>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{4500A2D3-C087-4FBC-BEBD-E630CD728788}</ProjectGuid>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -22,22 +23,6 @@
     <None Include="Microsoft.Azure.Management.Network.nuget.proj" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(LibraryFxTarget)' == 'net45' ">
-    <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.1.0.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup Condition=" '$(LibraryFxTarget)' == 'portable' ">
-    <Reference Include="Microsoft.Rest.ClientRuntime">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.1.0.3\lib\portable-net403+win8+wpa81\Microsoft.Rest.ClientRuntime.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure">
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Rest.ClientRuntime.Azure.1.0.12\lib\portable-net403+win+wpa81\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" Condition=" '$(LibraryFxTarget)' == 'portable' " />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(LibraryFxTarget)' != 'portable' " />
   <Import Project="$(LibraryNugetPackageFolder)\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('$(LibraryNugetPackageFolder)\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

diff --git a/src/ResourceManagement/Resource/Resource.sln b/src/ResourceManagement/Resource/Resource.sln
@@ -9,16 +9,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Resources.Tests", "Resource
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Net40-Debug|Any CPU = Net40-Debug|Any CPU
-		Net40-Release|Any CPU = Net40-Release|Any CPU
 		Net45-Debug|Any CPU = Net45-Debug|Any CPU
 		Net45-Release|Any CPU = Net45-Release|Any CPU
 		Portable-Debug|Any CPU = Portable-Debug|Any CPU
 		Portable-Release|Any CPU = Portable-Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
@@ -27,8 +23,6 @@ Global
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{165EF660-235B-45AF-83CB-0D32BEF4C1A2}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
-		{BE9D7270-27CB-45EB-BD26-FEA68087E835}.Net40-Debug|Any CPU.ActiveCfg = Net40-Debug|Any CPU
-		{BE9D7270-27CB-45EB-BD26-FEA68087E835}.Net40-Release|Any CPU.ActiveCfg = Net40-Release|Any CPU
 		{BE9D7270-27CB-45EB-BD26-FEA68087E835}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
 		{BE9D7270-27CB-45EB-BD26-FEA68087E835}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
 		{BE9D7270-27CB-45EB-BD26-FEA68087E835}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU