Update the logic of gen2main (Azure#23507)

* Update the logic of gen2main * Update the logic of gen2main * Remove useless files * Rename Az.autorest.hybrid.props to Az.autorest.props * Rename Az.autorest.hybrid.props to Az.autorest.props * Rename Az.autorest.hybrid.props to Az.autorest.props * Rename Az.autorest.hybrid.props to Az.autorest.props * Move UX folder * Move UX folder * Remove ScenarioTest.ResourceManager from az.accounts
anaarias-msft · Nov 22, 2023 · 9e28914 · 9e28914
1 parent b82fea5
commit 9e28914
Show file tree

Hide file tree

Showing 140 changed files with 280 additions and 606 deletions.
diff --git a/.azure-pipelines/SyncFromMainBranchConfig.json b/.azure-pipelines/SyncFromMainBranchConfig.json
@@ -10,8 +10,6 @@
         "src/Az.props",
         "src/Az.Shared.props",
         "src/Az.Test.props",
-        "src/Az.autorest.hybrid.props",
-        "src/Az.autorest.hybrid.v2.props",
         "src/Az.autorest.props",
         "src/Az.Post.props",
         "src/psm1.props",

diff --git a/.azure-pipelines/code-gen.yml b/.azure-pipelines/code-gen.yml
@@ -81,12 +81,7 @@ jobs:
       Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force;
       Install-Module -Name Az.Accounts -Force;
       Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1;
-      $subModuleFolders = Get-ChildItem .\artifacts\src\${{ parameters.ServiceName }} -Directory -Filter *.Autorest;
-      if ($subModuleFolders -eq $null) {
-        Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
-      } else {
-        Move-Generation2MasterHybrid -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
-      }
+      Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
       git config user.email "65331932+azure-powershell-bot@users.noreply.github.com";
       git config user.name "azure-powershell-bot";
       git add ./src;

diff --git a/.azure-pipelines/sync-tools-folder.yml b/.azure-pipelines/sync-tools-folder.yml
@@ -20,8 +20,6 @@ trigger:
       - src/Az.props
       - src/Az.Shared.props
       - src/Az.Test.props
-      - src/Az.autorest.hybrid.props
-      - src/Az.autorest.hybrid.v2.props
       - src/Az.autorest.props
       - src/Az.Post.props
       - src/psm1.props

diff --git a/src/ADDomainServices/ADDomainServices.Autorest/Az.ADDomainServices.csproj b/src/ADDomainServices/ADDomainServices.Autorest/Az.ADDomainServices.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>ADDomainServices</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/Accounts/Accounts.sln b/src/Accounts/Accounts.sln
@@ -12,8 +12,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication", "Authentic
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication.ResourceManager", "Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{3E016018-D65D-4336-9F64-17DA97783AD0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScenarioTest.ResourceManager", "..\..\tools\ScenarioTest.ResourceManager\ScenarioTest.ResourceManager.csproj", "{F83FBA8D-732D-437C-A0E2-02E45B01E123}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFx", "..\..\tools\TestFx\TestFx.csproj", "{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authenticators", "Authenticators\Authenticators.csproj", "{6BD6B80A-06AF-4B5B-9230-69CCFC6C8D64}"
@@ -48,10 +46,6 @@ Global
 		{3E016018-D65D-4336-9F64-17DA97783AD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E016018-D65D-4336-9F64-17DA97783AD0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F83FBA8D-732D-437C-A0E2-02E45B01E123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F83FBA8D-732D-437C-A0E2-02E45B01E123}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F83FBA8D-732D-437C-A0E2-02E45B01E123}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F83FBA8D-732D-437C-A0E2-02E45B01E123}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/src/Advisor/Advisor.Autorest/Az.Advisor.csproj b/src/Advisor/Advisor.Autorest/Az.Advisor.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>Advisor</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/Aks/Aks.Autorest/Az.Aks.csproj b/src/Aks/Aks.Autorest/Az.Aks.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>Aks</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/Alb/Alb.Autorest/Az.Alb.csproj b/src/Alb/Alb.Autorest/Az.Alb.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>Alb</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/AlertsManagement/PrometheusRuleGroups.Autorest/Az.PrometheusRuleGroups.csproj b/src/AlertsManagement/PrometheusRuleGroups.Autorest/Az.PrometheusRuleGroups.csproj
@@ -5,6 +5,6 @@
     <PsModuleFolder>PrometheusRuleGroups.Autorest</PsModuleFolder>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 </Project>
diff --git a/src/App/App.Autorest/Az.App.csproj b/src/App/App.Autorest/Az.App.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>App</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/AppConfiguration/AppConfiguration.Autorest/Az.AppConfiguration.csproj b/src/AppConfiguration/AppConfiguration.Autorest/Az.AppConfiguration.csproj
@@ -5,6 +5,6 @@
     <PsModuleFolder>AppConfiguration.Autorest</PsModuleFolder>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 </Project>
diff --git a/src/AppConfiguration/AppConfigurationData.Autorest/Az.AppConfigurationdata.csproj b/src/AppConfiguration/AppConfigurationData.Autorest/Az.AppConfigurationdata.csproj
@@ -5,6 +5,6 @@
     <PsModuleFolder>AppConfigurationData.Autorest</PsModuleFolder>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 </Project>
diff --git a/src/ApplicationInsights/ApplicationInsights.Autorest/Az.ApplicationInsights.csproj b/src/ApplicationInsights/ApplicationInsights.Autorest/Az.ApplicationInsights.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>ApplicationInsights</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/ArcResourceBridge/ArcResourceBridge.Autorest/Az.ArcResourceBridge.csproj b/src/ArcResourceBridge/ArcResourceBridge.Autorest/Az.ArcResourceBridge.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>ArcResourceBridge</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/Attestation/Attestation.Autorest/Az.Attestation.csproj b/src/Attestation/Attestation.Autorest/Az.Attestation.csproj
@@ -5,6 +5,6 @@
     <PsModuleFolder>Attestation.Autorest</PsModuleFolder>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 </Project>
diff --git a/src/Automanage/Automanage.Autorest/Az.Automanage.csproj b/src/Automanage/Automanage.Autorest/Az.Automanage.csproj
@@ -4,7 +4,7 @@
     <PsRootModuleName>Automanage</PsRootModuleName>
   </PropertyGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.hybrid.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.Post.props" />
 
 </Project>
diff --git a/src/Az.autorest.hybrid.v2.props b/src/Az.autorest.hybrid.v2.props