Update Track 2 Mgmt Plane Template (#21876)

* Update Track 2 Mgmt Plane Template * Moving the package ref into the actual project file * Fixing Management tests and updating sln to include missed project * Update build for core.test and invert the mgmt shared test code include. * Fix CI
Azure · Jun 16, 2021 · c6665ba · c6665ba
1 parent 75b312b
commit c6665ba
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 49 deletions.
diff --git a/common/ManagementTestShared/Current/ManagementRecordedTestBase.cs b/common/ManagementTestShared/Current/ManagementRecordedTestBase.cs
@@ -27,14 +27,7 @@ protected ManagementRecordedTestBase(bool isAsync, RecordedTestMode mode) : base
 
         protected ValueTask<Response<T>> WaitForCompletionAsync<T>(Operation<T> operation)
         {
-            if (Mode == RecordedTestMode.Playback)
-            {
-                return operation.WaitForCompletionAsync(ZeroPollingInterval, default);
-            }
-            else
-            {
-                return operation.WaitForCompletionAsync();
-            }
+            return operation.WaitForCompletionAsync();
         }
 
         protected ResourcesManagementClient GetResourceManagementClient()

diff --git a/eng/Azure.Management.Test.targets b/eng/Azure.Management.Test.targets
@@ -4,12 +4,12 @@
     <RbacSharedSources>$(MSBuildThisFileDirectory)/../sdk/testcommon/Azure.Graph.Rbac/src</RbacSharedSources>
     </PropertyGroup>
 
-  <ItemGroup Condition="'$(TestHelperProjects)' != '' and '$(UseNewMgmtFramework)' != 'true'">
+  <ItemGroup Condition="'$(UseNewMgmtFramework)' == 'false'">
     <Compile Include="$(ManagementTestSharedSources)/Current/**/*.cs"
              Link="TestShared/%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TestHelperProjects)' != '' and '$(UseNewMgmtFramework)' == 'true'">
+  <ItemGroup Condition="'$(UseNewMgmtFramework)' == '' or '$(UseNewMgmtFramework)' == 'true'">
     <Compile Include="$(ManagementTestSharedSources)/Redesign/**/*.cs"
              Link="TestShared/%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -115,6 +115,11 @@
     <PackageReference Update="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
+  <!-- Packages intended for Management libraries only -->
+  <ItemGroup Condition="'$(IsMgmtLibrary)' == 'true'">
+    <PackageReference Update="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210526.3" />
+  </ItemGroup>
+
   <!-- Packages intended for Extensions libraries only -->
   <ItemGroup Condition="'$(IsExtensionClientLibrary)' == 'true'">
     <PackageReference Update="Microsoft.AspNetCore.DataProtection" Version="2.1.0" />

diff --git a/eng/templates/Azure.ResourceManager.Template/src/Azure.ResourceManager.Template.csproj b/eng/templates/Azure.ResourceManager.Template/src/Azure.ResourceManager.Template.csproj
@@ -5,4 +5,7 @@
     <Description>Azure Resource Manager client SDK for Azure resource provider ProviderFullName</Description>
     <PackageTags>azure;management;arm;resource manager;ProviderNameLowercase</PackageTags>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Azure.ResourceManager.Core"/>
+  </ItemGroup>
 </Project>
diff --git a/...emplates/Azure.ResourceManager.Template/tests/Azure.ResourceManager.Template.Tests.csproj b/...emplates/Azure.ResourceManager.Template/tests/Azure.ResourceManager.Template.Tests.csproj
@@ -1,12 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
-  </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="$(AzureCoreTestFramework)" />
+    <PackageReference Include="Azure.ResourceManager.Core"/>
     <ProjectReference Include="..\src\Azure.ResourceManager.Template.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Azure.ResourceManager.Resources"/>
-  </ItemGroup>
 </Project>
diff --git a/...esourceManager.AppConfiguration/tests/Azure.ResourceManager.AppConfiguration.Tests.csproj b/...esourceManager.AppConfiguration/tests/Azure.ResourceManager.AppConfiguration.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.ResourceManager.AppConfiguration.csproj" />

diff --git a/...zure.ResourceManager.Communication/tests/Azure.ResourceManager.Communication.Tests.csproj b/...zure.ResourceManager.Communication/tests/Azure.ResourceManager.Communication.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(AzureCoreTestFramework)" />

diff --git a/sdk/compute/Azure.ResourceManager.Compute/tests/Azure.ResourceManager.Compute.Tests.csproj b/sdk/compute/Azure.ResourceManager.Compute/tests/Azure.ResourceManager.Compute.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.ResourceManager.Compute.csproj" />

diff --git a/sdk/core/Azure.Core/Azure.Core.sln b/sdk/core/Azure.Core/Azure.Core.sln
@@ -31,6 +31,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Test.Perf", "..\..\..
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.Core", "..\..\resourcemanager\Azure.ResourceManager.Core\src\Azure.ResourceManager.Core.csproj", "{8E60A748-3973-471A-B103-EC9406BB3313}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.AI.TextAnalytics", "..\..\textanalytics\Azure.AI.TextAnalytics\src\Azure.AI.TextAnalytics.csproj", "{B1FFA603-1CAA-4CE0-97E9-CA6CE9D498B9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,6 +95,10 @@ Global
 		{8E60A748-3973-471A-B103-EC9406BB3313}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E60A748-3973-471A-B103-EC9406BB3313}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E60A748-3973-471A-B103-EC9406BB3313}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1FFA603-1CAA-4CE0-97E9-CA6CE9D498B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1FFA603-1CAA-4CE0-97E9-CA6CE9D498B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1FFA603-1CAA-4CE0-97E9-CA6CE9D498B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1FFA603-1CAA-4CE0-97E9-CA6CE9D498B9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/sdk/core/Azure.Core/tests/TestClients/TestResourceContainer.cs b/sdk/core/Azure.Core/tests/TestClients/TestResourceContainer.cs
@@ -17,57 +17,55 @@ public class TestResourceContainer
         [ForwardsClientCalls]
         public virtual Pageable<TestResource> List(int pages = 1, CancellationToken cancellation = default)
         {
-            FuncPageable<object> results = GetSyncResults(pages);
-            return new PhWrappingPageable<object, TestResource>(results, o => new TestResource());
+            return GetSyncResults(pages);
         }
 
-        private FuncPageable<object> GetSyncResults(int pages)
+        private FuncPageable<TestResource> GetSyncResults(int pages)
         {
-            Page<object> pageFunc(int? pageSizeHint)
+            Page<TestResource> pageFunc(int? pageSizeHint)
             {
                 //simulates forwarding with todays wrapper.  This should go away after codegen is finished
                 using var scope = _diagnostic.CreateScope("TestResourceContainer.GetSyncResults");
                 scope.Start();
 
                 try
                 {
-                    return Page<object>.FromValues(new object[] { new object(), new object() }, null, null);
+                    return Page<TestResource>.FromValues(new TestResource[] { new TestResource(), new TestResource() }, null, null);
                 }
                 catch (Exception e)
                 {
                     scope.Failed(e);
                     throw;
                 }
             }
-            return new FuncPageable<object>((cToken, pageSize) => pageFunc(pageSize));
+            return new FuncPageable<TestResource>((cToken, pageSize) => pageFunc(pageSize));
         }
 
         [ForwardsClientCalls]
         public virtual AsyncPageable<TestResource> ListAsync(int pages = 1, CancellationToken cancellation = default)
         {
-            FuncAsyncPageable<object> results = GetAsyncResults(pages);
-            return new PhWrappingAsyncPageable<object, TestResource>(results, o => new TestResource());
+            return GetAsyncResults(pages);
         }
 
-        private FuncAsyncPageable<object> GetAsyncResults(int pages)
+        private FuncAsyncPageable<TestResource> GetAsyncResults(int pages)
         {
-            async Task<Page<object>> pageFunc(int? pageSizeHint)
+            async Task<Page<TestResource>> pageFunc(int? pageSizeHint)
             {
                 using var scope = _diagnostic.CreateScope("TestResourceContainer.GetAsyncResults");
                 scope.Start();
 
                 try
                 {
                     await Task.Delay(10);
-                    return Page<object>.FromValues(new object[] { new object(), new object() }, null, null);
+                    return Page<TestResource>.FromValues(new TestResource[] { new TestResource(), new TestResource() }, null, null);
                 }
                 catch (Exception e)
                 {
                     scope.Failed(e);
                     throw;
                 }
             }
-            return new FuncAsyncPageable<object>((cToken, pageSize) => pageFunc(pageSize));
+            return new FuncAsyncPageable<TestResource>((cToken, pageSize) => pageFunc(pageSize));
         }
 
         public virtual string Method()

diff --git a/...cosmosdb/Azure.ResourceManager.CosmosDB/tests/Azure.ResourceManager.CosmosDB.Tests.csproj b/...cosmosdb/Azure.ResourceManager.CosmosDB/tests/Azure.ResourceManager.CosmosDB.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(AzureCoreTestFramework)" />

diff --git a/sdk/dns/Azure.ResourceManager.Dns/tests/Azure.ResourceManager.Dns.Tests.csproj b/sdk/dns/Azure.ResourceManager.Dns/tests/Azure.ResourceManager.Dns.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
     <NoWarn>$(NoWarn);SA1649</NoWarn>
     <FileUpgradeFlags>
     </FileUpgradeFlags>

diff --git a/...enthub/Azure.ResourceManager.EventHubs/tests/Azure.ResourceManager.EventHubs.Tests.csproj b/...enthub/Azure.ResourceManager.EventHubs/tests/Azure.ResourceManager.EventHubs.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(AzureCoreTestFramework)" />

diff --git a/...insights/Azure.ResourceManager.Insights/tests/Azure.ResourceManager.Insights.Tests.csproj b/...insights/Azure.ResourceManager.Insights/tests/Azure.ResourceManager.Insights.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="$(AzureCoreTestFramework)" />

diff --git a/...keyvault/Azure.ResourceManager.KeyVault/tests/Azure.ResourceManager.KeyVault.Tests.csproj b/...keyvault/Azure.ResourceManager.KeyVault/tests/Azure.ResourceManager.KeyVault.Tests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TestHelperProjects>Rbac1.6;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.ResourceManager.KeyVault.csproj" />

diff --git a/....MachineLearningServices/tests/Azure.ResourceManager.MachineLearningServices.Tests.csproj b/....MachineLearningServices/tests/Azure.ResourceManager.MachineLearningServices.Tests.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(AzureCoreTestFramework)" />
+    <PackageReference Include="Azure.ResourceManager.Resources"/>
     <ProjectReference Include="..\src\Azure.ResourceManager.MachineLearningServices.csproj" />
     <PackageReference Include="Microsoft.Azure.AutoRest.CSharp" VersionOverride="$(MgmtAutorestVersion)" PrivateAssets="All" />
   </ItemGroup>

diff --git a/sdk/network/Azure.ResourceManager.Network/tests/Azure.ResourceManager.Network.Tests.csproj b/sdk/network/Azure.ResourceManager.Network/tests/Azure.ResourceManager.Network.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
-    <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+  <PropertyGroup>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.ResourceManager.Network.csproj" />

diff --git a/sdk/resourcemanager/Azure.ResourceManager.Core/tests/Azure.ResourceManager.Core.Tests.csproj b/sdk/resourcemanager/Azure.ResourceManager.Core/tests/Azure.ResourceManager.Core.Tests.csproj
@@ -2,10 +2,6 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);RESOURCES_RP</DefineConstants>
-    <TestHelperProjects>;</TestHelperProjects>
-    <UseNewMgmtFramework>true</UseNewMgmtFramework>
-  </PropertyGroup>
-  <PropertyGroup>
     <NoWarn>SA1649;SA1633;SA1000;SA1028;SA1400;SA1508</NoWarn>
   </PropertyGroup>
 

diff --git a/...ources/Azure.ResourceManager.Resources/tests/Azure.ResourceManager.Resources.Tests.csproj b/...ources/Azure.ResourceManager.Resources/tests/Azure.ResourceManager.Resources.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);RESOURCES_RP</DefineConstants>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NoWarn>SA1649</NoWarn>

diff --git a/sdk/sqlmanagement/Azure.ResourceManager.Sql/tests/Azure.ResourceManager.Sql.Tests.csproj b/sdk/sqlmanagement/Azure.ResourceManager.Sql/tests/Azure.ResourceManager.Sql.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="ServerCrudScenarioTests.cs" />

diff --git a/sdk/storage/Azure.ResourceManager.Storage/tests/Azure.ResourceManager.Storage.Tests.csproj b/sdk/storage/Azure.ResourceManager.Storage/tests/Azure.ResourceManager.Storage.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TestHelperProjects>;</TestHelperProjects>
-    <TemporaryUsePreviousGeneratorVersion>true</TemporaryUsePreviousGeneratorVersion>
+    <UseNewMgmtFramework>false</UseNewMgmtFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.ResourceManager.Storage.csproj" />
@@ -10,4 +9,4 @@
     <PackageReference Include="Azure.ResourceManager.Resources" />
     <PackageReference Include="Microsoft.Azure.AutoRest.CSharp" VersionOverride="$(MgmtAutorestVersion)" PrivateAssets="All" />
   </ItemGroup>
-</Project>
+</Project>