Merge pull request Azure#4 from shahabhijeet/MultiRPUpgrade

RP Upgrades

AzSdk.props

@@ -1,4 +1,4 @@
 <Project ToolsVersion="15.0">
-	<Import Project="tools\buildTargets\common.Build.props"/>
-	<Import Project="tools\buildTargets\common.NugetPackage.props" />	
+	<!-- <Import Project="tools\buildTargets\common.Build.props"/> -->
+	<!-- <Import Project="tools\buildTargets\common.NugetPackage.props" />	 -->
 </Project>

Directory.Build.props

@@ -1,5 +1,6 @@
 <Project>  
-  <Import Project="dirs.proj" />
+	<Import Project="dirs.proj" />
+
 
 	<PropertyGroup>
 		<LibraryRoot>$(MSBuildThisFileDirectory)</LibraryRoot>
@@ -16,6 +17,10 @@
 		<NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
 		<ImportDirectoryBuildTargets>true</ImportDirectoryBuildTargets>
 	</PropertyGroup>
+
+	<PropertyGroup>
+		<BuildInParallel>true</BuildInParallel>
+	</PropertyGroup>
 
 	<ItemGroup Condition="'$(PublishTestProjects)' == 'false' Or '$(PublishTestProjects)' == ''">
 		<LibrariesToBuild Include="$(LibrarySourceFolder)\$(Scope)\*.sln" Condition=" '$(Scope)' != 'all'  " />
@@ -50,6 +55,9 @@
 
   </Target>
 
+
+	<Import Project="tools\buildTargets\common.Build.props"/>
+	<Import Project="tools\buildTargets\common.NugetPackage.props" />	
 </Project>
 
 <!--

Directory.Build.targets

@@ -1,5 +1,8 @@
 <Project>  
 <Import Project="tools\buildTargets\common.targets" />
+
+
+
 
   <!-- <Target Name="BuildSdk" DependsOnTargets="$(BuildTraversedProjectsDependsOn)" /> -->
 

NuGet.Config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+     <!-- To enable LocalFeed for testing uncomment the following line -->
+     <add key="Local" value="tools\LocalNugetFeed" />
+	 <add key="KVLocal" value="src\SDKs\KeyVault\KVLocalFeed" />
+   </packageSources>
+</configuration>

build.proj

@@ -3,10 +3,16 @@
 	<Import Project="directory.Build.targets" />
 	<Import Project="test.props" />
 	<Import Project="AzSdk.props" />
+
+	<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />  
+	<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
+	<Target Name="Build" DependsOnTargets="Restore;$(BuildTraversedProjectsDependsOn)" />
+	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
+	<!--
 	<Target Name="Clean" DependsOnTargets="$(CleanTraversedProjectsDependsOn)" />  
 	<Target Name="Build" DependsOnTargets="$(RestoreTraversedProjectsDependsOn);$(BuildTraversedProjectsDependsOn)" />
 	<Target Name="Restore" DependsOnTargets="$(RestoreTraversedProjectsDependsOn)" />
 	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-
+  -->
 </Project>

src/SDKs/AnalysisServices/AnalysisServices.Tests/AnalysisServices.Tests.csproj

@@ -10,7 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Azure.Management.Analysis\Microsoft.Azure.Management.Analysis.csproj" />
+    <PackageReference Include="Microsoft.Azure.Management.Analysis" Version="1.1.0-preview" />
+    <!--<ProjectReference Include="..\Management.Analysis\Microsoft.Azure.Management.Analysis.csproj" />-->
   </ItemGroup>
 
   <ItemGroup>

src/SDKs/AnalysisServices/AnalysisServices.Tests/Properties/AssemblyInfo.cs

@@ -8,6 +8,7 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
+/*
 [assembly: AssemblyTitle("AnalysisServices.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -20,10 +21,7 @@
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("bc70f362-fd99-4b13-8807-ff93fe06eff8")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -36,3 +34,7 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+*/
+    [assembly: ComVisible(false)]
+    // The following GUID is for the ID of the typelib if this project is exposed to COM
+    [assembly: Guid("bc70f362-fd99-4b13-8807-ff93fe06eff8")]

src/SDKs/AnalysisServices/AnalysisServices.sln

@@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Analysis", "Microsoft.Azure.Management.Analysis\Microsoft.Azure.Management.Analysis.csproj", "{CBE97730-45F5-448E-88E9-55DF94D65B77}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnalysisServices.Tests", "AnalysisServices.Tests\AnalysisServices.Tests.csproj", "{2296B795-8609-475A-8090-6624C3631975}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Analysis", "Management.Analysis\Microsoft.Azure.Management.Analysis.csproj", "{93D8D9F6-7861-4CA0-8257-CFB0E07CF8A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CBE97730-45F5-448E-88E9-55DF94D65B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBE97730-45F5-448E-88E9-55DF94D65B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBE97730-45F5-448E-88E9-55DF94D65B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBE97730-45F5-448E-88E9-55DF94D65B77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2296B795-8609-475A-8090-6624C3631975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2296B795-8609-475A-8090-6624C3631975}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2296B795-8609-475A-8090-6624C3631975}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2296B795-8609-475A-8090-6624C3631975}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93D8D9F6-7861-4CA0-8257-CFB0E07CF8A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93D8D9F6-7861-4CA0-8257-CFB0E07CF8A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93D8D9F6-7861-4CA0-8257-CFB0E07CF8A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93D8D9F6-7861-4CA0-8257-CFB0E07CF8A2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/SDKs/AnalysisServices/Microsoft.Azure.Management.Analysis/Microsoft.Azure.Management.Analysis.csproj → src/SDKs/AnalysisServices/Management.Analysis/Microsoft.Azure.Management.Analysis.csproj

@@ -12,12 +12,6 @@
     <TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
   </PropertyGroup>
 
-  <!--
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="[3.3.5,4.0.0)" />
-    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="[2.3.5,3.0.0)" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
@@ -35,5 +29,4 @@
     <PackageReference Include="System.Linq" Version="4.3.0" />
     <PackageReference Include="System.Runtime" Version="4.3.0" />
   </ItemGroup>
-  -->
 </Project>

src/SDKs/AnalysisServices/Microsoft.Azure.Management.Analysis/Properties/AssemblyInfo.cs → src/SDKs/AnalysisServices/Management.Analysis/Properties/AssemblyInfo.cs

@@ -5,6 +5,7 @@
 using System.Resources;
 using System.Runtime.InteropServices;
 
+/*
 [assembly: AssemblyTitle("Microsoft Azure Analysis Services Management Library")]
 [assembly: AssemblyDescription("Provides management functionality for Azure Analysis Services Resources.")]
 
@@ -17,3 +18,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
+*/

src/SDKs/Authorization/Authorization.Tests/Authorization.Tests.csproj

@@ -10,7 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Azure.Management.Authorization\Microsoft.Azure.Management.Authorization.csproj" />
+    <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.5.0-preview" />
+    <!--<ProjectReference Include="..\Microsoft.Azure.Management.Authorization\Microsoft.Azure.Management.Authorization.csproj" />-->
   </ItemGroup>
 
   <ItemGroup>

src/SDKs/Authorization/Authorization.Tests/Properties/AssemblyInfo.cs

@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
+/*
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
@@ -17,3 +17,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
+*/

src/SDKs/Authorization/Authorization.Tests/Tests/BasicTests.cs

@@ -36,7 +36,8 @@ public BasicTests(TestExecutionContext context, ITestOutputHelper output)
             _output = output;
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void ClassicAdministratorListTests()
         {
             HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
@@ -67,7 +68,8 @@ public void ClassicAdministratorListTests()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleAssignmentByIdTests()
         {
             HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
@@ -120,7 +122,8 @@ public void RoleAssignmentByIdTests()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleAssignmentsListGetTests()
         {
             HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
@@ -172,7 +175,8 @@ public void RoleAssignmentsListGetTests()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleAssignmentsCreateDeleteTests()
         {
             HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
@@ -212,7 +216,8 @@ public void RoleAssignmentsCreateDeleteTests()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleAssignmentAtScopeAndAboveTest()
         {
             HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
@@ -242,9 +247,11 @@ public void RoleAssignmentAtScopeAndAboveTest()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleAssignmentListByFilterTest()
         {
+            HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {
                 var client = testContext.GetAuthorizationManagementClient(context);
@@ -294,6 +301,7 @@ public void RoleAssignmentListByFilterTest()
         [Fact(Skip = "PAS Service Issue - Paging not enabled")]
         public void RoleAssignmentPagingTest()
         {
+            HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {
                 var client = testContext.GetAuthorizationManagementClient(context);
@@ -389,9 +397,11 @@ public void RoleAssignmentPagingTest()
         }
 
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleAssignmentListForScopeTest()
         {
+            HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {
                 var client = testContext.GetAuthorizationManagementClient(context);
@@ -420,9 +430,11 @@ public void RoleAssignmentListForScopeTest()
             }
         }
 
-        [Fact(Skip = "Graph issue when adding user to group, needs investigation")]
+        //[Fact(Skip = "Graph issue when adding user to group, needs investigation")]
+        [Fact]
         public void RoleAssignmentListWithAssignedToFilterTest()
         {
+            HttpMockServer.RecordsDirectory = GetSessionsDirectoryPath();
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {
                 var client = testContext.GetAuthorizationManagementClient(context);
@@ -492,9 +504,12 @@ public void RoleAssignmentListWithAssignedToFilterTest()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleDefinitionsListGetTests()
         {
+            string executingAssemblyPath = this.GetType().GetTypeInfo().Assembly.Location;
+            HttpMockServer.RecordsDirectory = Path.Combine(Path.GetDirectoryName(executingAssemblyPath), "SessionRecords");
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {
                 var client = testContext.GetAuthorizationManagementClient(context);
@@ -580,9 +595,12 @@ public void RoleDefinitionsListGetTests()
         //    }
         //}
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleDefinitionsByIdTests()
         {
+            string executingAssemblyPath = this.GetType().GetTypeInfo().Assembly.Location;
+            HttpMockServer.RecordsDirectory = Path.Combine(Path.GetDirectoryName(executingAssemblyPath), "SessionRecords");
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {
                 var client = testContext.GetAuthorizationManagementClient(context);
@@ -614,10 +632,13 @@ public void RoleDefinitionsByIdTests()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "After upgrade to vs2017, starts failing. Needs investigation")]
+        [Fact]
         public void RoleDefinitionUpdateTests()
         {
-			using (MockContext context = MockContext.Start(this.GetType().FullName))
+            string executingAssemblyPath = this.GetType().GetTypeInfo().Assembly.Location;
+            HttpMockServer.RecordsDirectory = Path.Combine(Path.GetDirectoryName(executingAssemblyPath), "SessionRecords");
+            using (MockContext context = MockContext.Start(this.GetType().FullName))
             {
                 var client = testContext.GetAuthorizationManagementClient(context);
 
@@ -696,9 +717,12 @@ public void RoleDefinitionUpdateTests()
             }
         }
 
-        [Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        //[Fact(Skip = "Need to re-record due to VS2017 nuget upgrade")]
+        [Fact]
         public void RoleDefinitionCreateTests()
         {
+            string executingAssemblyPath = this.GetType().GetTypeInfo().Assembly.Location;
+            HttpMockServer.RecordsDirectory = Path.Combine(Path.GetDirectoryName(executingAssemblyPath), "SessionRecords");
             const string RoleDefIdPrefix = "/providers/Microsoft.Authorization/roleDefinitions/";
             using (MockContext context = MockContext.Start(this.GetType().FullName))
             {

src/SDKs/Authorization/Authorization.sln

@@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Authorization", "Microsoft.Azure.Management.Authorization\Microsoft.Azure.Management.Authorization.csproj", "{53BC286B-ECEF-4152-B15E-60B139DB9F48}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization.Tests", "Authorization.Tests\Authorization.Tests.csproj", "{CBDF6C03-1DF5-4D86-A23F-F5F3EA1BBEEC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.Management.Authorization", "Management.Authorization\Microsoft.Azure.Management.Authorization.csproj", "{99EF70BF-5689-4175-8848-602904ADE9FC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{53BC286B-ECEF-4152-B15E-60B139DB9F48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53BC286B-ECEF-4152-B15E-60B139DB9F48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53BC286B-ECEF-4152-B15E-60B139DB9F48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53BC286B-ECEF-4152-B15E-60B139DB9F48}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CBDF6C03-1DF5-4D86-A23F-F5F3EA1BBEEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CBDF6C03-1DF5-4D86-A23F-F5F3EA1BBEEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CBDF6C03-1DF5-4D86-A23F-F5F3EA1BBEEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBDF6C03-1DF5-4D86-A23F-F5F3EA1BBEEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99EF70BF-5689-4175-8848-602904ADE9FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99EF70BF-5689-4175-8848-602904ADE9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99EF70BF-5689-4175-8848-602904ADE9FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99EF70BF-5689-4175-8848-602904ADE9FC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE