Update the migration guide. (Azure#38961)

yaotongms · Oct 12, 2023 · 6c063f6 · 6c063f6
1 parent 8c5b5f8
commit 6c063f6
Show file tree

Hide file tree

Showing 22 changed files with 782 additions and 222 deletions.
diff --git a/sdk/resourcemanager/Azure.ResourceManager/Azure.ResourceManager.sln b/sdk/resourcemanager/Azure.ResourceManager/Azure.ResourceManager.sln
@@ -9,20 +9,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.Tests", "tests\Azure.ResourceManager.Tests.csproj", "{83E7651C-7FBE-45AA-B740-31FE9A3E44C7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{217C9506-A0E0-4486-96FF-DAC0DF92CD1F}"
-	ProjectSection(SolutionItems) = preProject
-		samples\README.md = samples\README.md
-		samples\Sample1_HelloWorld.md = samples\Sample1_HelloWorld.md
-		samples\Sample1_HelloWorldAsync.md = samples\Sample1_HelloWorldAsync.md
-		samples\Sample2_ManagingResourceGroups.md = samples\Sample2_ManagingResourceGroups.md
-		samples\Sample3_CreatingAVirtualNetwork.md = samples\Sample3_CreatingAVirtualNetwork.md
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4E159B41-7E02-4039-983A-F94EBF41D3C1}"
 	ProjectSection(SolutionItems) = preProject
 		docs\AuthUsingEnvironmentVariables.md = docs\AuthUsingEnvironmentVariables.md
 		docs\CONTRIBUTING.md = docs\CONTRIBUTING.md
 		docs\MigrationGuide.md = docs\MigrationGuide.md
+		docs\README.md = docs\README.md
+		docs\Sample1_HelloWorld.md = docs\Sample1_HelloWorld.md
+		docs\Sample1_HelloWorldAsync.md = docs\Sample1_HelloWorldAsync.md
+		docs\Sample2_ManagingResourceGroups.md = docs\Sample2_ManagingResourceGroups.md
+		docs\Sample3_CreatingAVirtualNetwork.md = docs\Sample3_CreatingAVirtualNetwork.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Core", "..\..\core\Azure.Core\src\Azure.Core.csproj", "{E0F3952A-D1C7-4CE4-B2A8-5C34945EBED8}"

diff --git a/sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md b/sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md
@@ -202,7 +202,7 @@ Minor changes since the public beta release:
 
 ### Breaking Changes
 
-- Removed DefaultSubscription property from ArmClient and added GetDefaultSubscription()/GetDefaultSubscriptionAsync() methods. See the [Hello World examples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/README.md) of how to use the new methods to get the default subscription.
+- Removed DefaultSubscription property from ArmClient and added GetDefaultSubscription()/GetDefaultSubscriptionAsync() methods. See the [Hello World examples](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Samples.md) of how to use the new methods to get the default subscription.
 - Renamed [Resource]Container to [Resource]Collection and added the IEnumerable<T> and IAsyncEnumerable<T> interfaces to them making it easier to iterate over the list in the simple case.
 
 ## 1.0.0-beta.4 (2021-09-28)

diff --git a/sdk/resourcemanager/Azure.ResourceManager/README.md b/sdk/resourcemanager/Azure.ResourceManager/README.md
@@ -457,8 +457,8 @@ To run test with code coverage and auto generate an html report with just a sing
 ## Next steps
 ### More sample code
 
-- [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample2_ManagingResourceGroups.md)
-- [Creating a Virtual Network](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample3_CreatingAVirtualNetwork.md)
+- [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample2_ManagingResourceGroups.md)
+- [Creating a Virtual Network](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample3_CreatingAVirtualNetwork.md)
 - [.NET Management Library Code Samples](https://docs.microsoft.com/samples/browse/?branch=master&languages=csharp&term=managing%20using%20Azure%20.NET%20SDK)
 
 ### Other Documentation

diff --git a/sdk/resourcemanager/Azure.ResourceManager/docs/MigrationGuide.md b/sdk/resourcemanager/Azure.ResourceManager/docs/MigrationGuide.md
diff --git a/...urceManager/samples/Sample1_HelloWorld.md → ...esourceManager/docs/Sample1_HelloWorld.md b/...urceManager/samples/Sample1_HelloWorld.md → ...esourceManager/docs/Sample1_HelloWorld.md
@@ -44,4 +44,4 @@ ResourceGroupCollection resourceGroups = subscription.GetResourceGroups();
 ```
 
 ## Next stepts
-Take a look at the [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample2_ManagingResourceGroups.md) samples.
+Take a look at the [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample2_ManagingResourceGroups.md) samples.
diff --git a/...anager/samples/Sample1_HelloWorldAsync.md → ...ceManager/docs/Sample1_HelloWorldAsync.md b/...anager/samples/Sample1_HelloWorldAsync.md → ...ceManager/docs/Sample1_HelloWorldAsync.md
@@ -46,4 +46,4 @@ ResourceGroupCollection resourceGroups = subscription.GetResourceGroups();
 ```
 
 ## Next stepts
-Take a look at the [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample2_ManagingResourceGroups.md) samples.
+Take a look at the [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample2_ManagingResourceGroups.md) samples.
diff --git a/...samples/Sample2_ManagingResourceGroups.md → ...er/docs/Sample2_ManagingResourceGroups.md b/...samples/Sample2_ManagingResourceGroups.md → ...er/docs/Sample2_ManagingResourceGroups.md
@@ -88,3 +88,5 @@ string resourceGroupName = "myRgName";
 ResourceGroupResource resourceGroup = await resourceGroups.GetAsync(resourceGroupName);
 await resourceGroup.DeleteAsync(WaitUntil.Completed);
 ```
+## Next stepts
+Take a look at the [Creating a Virtual Network](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample3_CreatingAVirtualNetwork.md) samples.
diff --git a/...amples/Sample3_CreatingAVirtualNetwork.md → ...r/docs/Sample3_CreatingAVirtualNetwork.md b/...amples/Sample3_CreatingAVirtualNetwork.md → ...r/docs/Sample3_CreatingAVirtualNetwork.md
@@ -98,3 +98,6 @@ You can verify that your virtual network now has 2 subnets by doing the followin
 VirtualNetwork myVNet = await resourceGroup.GetVirtualNetworks().GetAsync(vnetName);
 Console.WriteLine(myVNet.Data.Subnets.Count);
 ```
+
+## Next stepts
+Take a look at the [Authenticate across tenants](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample4_MultiTenant.md) samples.
diff --git a/...rceManager/samples/Sample4_MultiTenant.md → ...sourceManager/docs/Sample4_MultiTenant.md b/...rceManager/samples/Sample4_MultiTenant.md → ...sourceManager/docs/Sample4_MultiTenant.md
@@ -23,7 +23,7 @@ In order to test for multi-tenant, you will need to setup a service principal fo
 internal class AuxiliaryPoilcy : HttpPipelineSynchronousPolicy
 {
     private static string AUTHORIZATION_AUXILIARY_HEADER = "x-ms-authorization-auxiliary";
-    string _token;
+    private string _token;
 
     internal AuxiliaryPoilcy(string token)
     {

diff --git a/...r/Azure.ResourceManager/samples/README.md → ...ger/Azure.ResourceManager/docs/Samples.md b/...r/Azure.ResourceManager/samples/README.md → ...ger/Azure.ResourceManager/docs/Samples.md
@@ -11,8 +11,8 @@ description: Samples for the Azure.ResourceManager client library
 
 # Azure.ResourceManager Samples
 
-- [Hello World - Getting a subscription](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample1_HelloWorld.md)
-- [Hello World - Getting a subscription async](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample1_HelloWorldAsync.md)
-- [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample2_ManagingResourceGroups.md)
-- [Creating a virtual network](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample3_CreatingAVirtualNetwork.md)
-- [Enable Cross-Tenant Authentication](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/samples/Sample4_MultiTenant.md)
+- [Hello World - Getting a subscription](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample1_HelloWorld.md)
+- [Hello World - Getting a subscription async](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample1_HelloWorldAsync.md)
+- [Managing Resource Groups](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample2_ManagingResourceGroups.md)
+- [Creating a virtual network](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample3_CreatingAVirtualNetwork.md)
+- [Enable Cross-Tenant Authentication](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/Sample4_MultiTenant.md)
diff --git a/sdk/resourcemanager/Azure.ResourceManager/samples/Azure.ResourceManager.Samples.csproj b/sdk/resourcemanager/Azure.ResourceManager/samples/Azure.ResourceManager.Samples.csproj
@@ -6,5 +6,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\Azure.ResourceManager.csproj"/>
+    <PackageReference Include="Azure.ResourceManager.Compute" />
+    <PackageReference Include="Azure.ResourceManager.Network" />
   </ItemGroup>
 </Project>
diff --git a/...eManager/tests/Samples/AuxiliaryPoilcy.cs → ...ger/samples/DocSamples/AuxiliaryPoilcy.cs b/...eManager/tests/Samples/AuxiliaryPoilcy.cs → ...ger/samples/DocSamples/AuxiliaryPoilcy.cs
@@ -1,4 +1,7 @@
-using Azure.Core;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core;
 using Azure.Core.Pipeline;
 
 namespace Azure.ResourceManager.Tests.Samples
@@ -7,7 +10,7 @@ namespace Azure.ResourceManager.Tests.Samples
     internal class AuxiliaryPoilcy : HttpPipelineSynchronousPolicy
     {
         private static string AUTHORIZATION_AUXILIARY_HEADER = "x-ms-authorization-auxiliary";
-        string _token;
+        private string _token;
 
         internal AuxiliaryPoilcy(string token)
         {