Skip to content

Resources SDK version 2020-10 #17163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bquantump merged 5 commits into from
Dec 3, 2020
Merged

Resources SDK version 2020-10 #17163

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc5469c
Generated SDK and re-recorded tests
Xynoclafe Nov 17, 2020
f1b77f8
rerecord remaining tests
Xynoclafe Nov 20, 2020
e70dcce
Updated version and release notes
Xynoclafe Nov 24, 2020
a7cc83a
regenerate from Swagger. Fixed possible breaking change
Xynoclafe Dec 2, 2020
dae1a56
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net i…
Xynoclafe Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/mgmt/mgmtmetadata/resources_resource-manager.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/resources/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-resources-2020-06 --csharp.output-folder=C:\Users\toegbeji\Documents\azure-sdk-for-net\sdk\resources\Microsoft.Azure.Management.Resource\src\Generated\Resources
2020-11-03 19:09:14 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/resources/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-resources-2020-10 --csharp.output-folder=C:\repos\azure-sdk-for-net\sdk\resources\Microsoft.Azure.Management.Resource\src\Generated\Resources
2020-11-23 23:51:31 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: f87c55b777b9ff515b8e623325688aa4ddf84c4a
Commit: a4e2481b68419504368711274d6994667ea8f5be
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413
2 changes: 1 addition & 1 deletion sdk/resources/Microsoft.Azure.Management.Resource/AzSdk.RP.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>Resources_2020-06-01;Resources_2019-10-01-preview;Features_2015-12-01;ManagementLinkClient_2016-09-01;Resources_2016-09-01;Authorization_2016-09-01;Authorization_2019-09-01;Management_2019-09-01;PolicyClient_2019-09-01;Management_2019-10-01;ResourceManagementClient_2019-10-01;Resources_2019-10-01;SubscriptionClient_2020-01-01;</AzureApiTag>
<AzureApiTag>Resources_2019-10-01-preview;Features_2015-12-01;ManagementLinkClient_2016-09-01;Resources_2016-09-01;Authorization_2016-09-01;Authorization_2019-09-01;Management_2019-09-01;PolicyClient_2019-09-01;Management_2020-06-01;ResourceManagementClient_2020-06-01;Resources_2020-10-01;Resources_2020-06-01;Resources_2020-01-01;SubscriptionClient_2020-01-01;Resources_2019-06-01-preview;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
31 changes: 23 additions & 8 deletions sdk/resources/Microsoft.Azure.Management.Resource/src/Generated/Models/TemplateLink.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/resources/Microsoft.Azure.Management.Resource/src/Generated/ResourceManagementClient.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...Microsoft.Azure.Management.Resource/src/Microsoft.Azure.Management.ResourceManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
Development of this library has shifted focus to the Azure Unified SDK. The future development will be focused on "Azure.ResourceManager.Resources" (https://www.nuget.org/packages/Azure.ResourceManager.Resources/). Please see the package changelog for more information.
</Description>
<AssemblyName>Microsoft.Azure.Management.ResourceManager</AssemblyName>
<Version>3.10.2-preview</Version>
<Version>3.11.0-preview</Version>
<PackageTags>Microsoft Azure resource management;resource management;resource groups;</PackageTags>
<PackageReleaseNotes>
<![CDATA[
This is a public release of the Azure Resource Manager SDK. This release includes Resources API version 2020-06-01. Updated Azure Policy Aliases contract to include additional information regarding whether an alias is modifiable.
This is a public release of the Azure Resource Manager SDK. This release includes Resources API version 2020-10-01. This release adds support for TemplateLink.queryString parameter for template deployments
]]>
</PackageReleaseNotes>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/resources/Microsoft.Azure.Management.Resource/src/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[assembly: AssemblyDescription("Provides Microsoft Azure resource management operations including Resource Groups.")]

[assembly: AssemblyVersion("3.0.0.0")]
[assembly: AssemblyFileVersion("3.10.2.0")]
[assembly: AssemblyFileVersion("3.11.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Azure .NET SDK")]
Expand Down
2 changes: 1 addition & 1 deletion sdk/resources/Microsoft.Azure.Management.Resource/src/generate.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# and copy these new set of files to the main Generated folder. This way exisiting files will not be deleted.

# Generate package with resources tag
Start-AutoRestCodeGeneration -ResourceProvider "resources/resource-manager" -SdkRepoRootPath "$PSScriptRoot\..\..\..\.." -AutoRestVersion "v2" -AutoRestCodeGenerationFlags "--tag=package-resources-2020-06" -SdkGenerationDirectory "$PSScriptRoot\Generated\Resources"
Start-AutoRestCodeGeneration -ResourceProvider "resources/resource-manager" -SdkRepoRootPath "$PSScriptRoot\..\..\..\.." -AutoRestVersion "v2" -AutoRestCodeGenerationFlags "--tag=package-resources-2020-10" -SdkGenerationDirectory "$PSScriptRoot\Generated\Resources"

# Generate package with subscriptions tag
#Start-AutoRestCodeGeneration -ResourceProvider "resources/resource-manager" -SdkRepoRootPath "$PSScriptRoot\..\..\..\.." -AutoRestVersion "v2" -AutoRestCodeGenerationFlags "--tag=package-subscriptions-2020-01" -SdkGenerationDirectory "$PSScriptRoot\Generated\Subscriptions"
Expand Down
6 changes: 3 additions & 3 deletions ...soft.Azure.Management.Resource/tests/ScenarioTests/DeploymentWhatIfTests.ScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ public void WhatIfAtManagementGroupScope_BlankTemplate_ReturnsNoChange()

// Act.
WhatIfOperationResult result = client.Deployments
.WhatIfAtManagementGroupScope("testMG", NewDeploymentName(), deploymentWhatIf);
.WhatIfAtManagementGroupScope("tag-mg-sdk", NewDeploymentName(), deploymentWhatIf);

// Assert.
Assert.Equal("Succeeded", result.Status);
Expand Down Expand Up @@ -479,7 +479,7 @@ public void WhatIfAtManagementGroupScope_ResourceIdOnlyMode_ReturnsChangesWithRe

// Act.
WhatIfOperationResult result = client.Deployments
.WhatIfAtManagementGroupScope("testMG", NewDeploymentName(), deploymentWhatIf);
.WhatIfAtManagementGroupScope("tag-mg-sdk", NewDeploymentName(), deploymentWhatIf);

// Assert.
Assert.Equal("Succeeded", result.Status);
Expand Down Expand Up @@ -518,7 +518,7 @@ public void WhatIfAtManagementGroupScope_FullResourcePayloadMode_ReturnsChangesW

// Act.
WhatIfOperationResult result = client.Deployments
.WhatIfAtManagementGroupScope("testMG", NewDeploymentName(), deploymentWhatIf);
.WhatIfAtManagementGroupScope("tag-mg-sdk", NewDeploymentName(), deploymentWhatIf);

// Assert.
Assert.Equal("Succeeded", result.Status);
Expand Down
2 changes: 1 addition & 1 deletion ...es/Microsoft.Azure.Management.Resource/tests/ScenarioTests/ResourceTests.ScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public void CreatedAndListResource()
var listResult = client.Resources.List(new ODataQuery<GenericResourceFilter>(r => r.ResourceType == "Microsoft.Web/serverFarms"));

Assert.NotEmpty(listResult);
Assert.Equal(5, listResult.First().Tags.Count);
Assert.Equal(2, listResult.First().Tags.Count);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...sources/Microsoft.Azure.Management.Resource/tests/ScenarioTests/TagTests.ScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ public void DeleteTagsWithSubscriptionTest()
using (MockContext context = MockContext.Start(this.GetType()))
{
// test tags for subscription
this.DeleteTagsTest(context: context).Properties.TagsProperty.Should().BeNull();
this.DeleteTagsTest(context: context).Properties.TagsProperty.Should().BeEmpty();
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...e.Management.Resource/tests/ScenarioTests/management_group_level_template.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"value": "testMG"
},
"subscriptionId": {
"value": "a93e8c5c-63cb-4635-933f-6d166ac25187"
"value": "a1bfa635-f2bf-42f1-86b5-848c674fc321"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ources/Microsoft.Azure.Management.Resource/tests/ScenarioTests/tenant_level_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"subscriptionId": {
"type": "string",
"defaultValue": "a93e8c5c-63cb-4635-933f-6d166ac25187"
"defaultValue": "ce7f58b7-53c8-4806-ad09-18b516f85d4a"
},
"roleDefinitionId": {
"type": "string",
Expand All @@ -25,7 +25,7 @@
"name": "[parameters('roleDefinitionId')]",
"apiVersion": "2018-07-01",
"properties": {
"roleName": "test-app",
"roleName": "test-role",
"description": "something",
"type": "CustomRole",
"permissions": [
Expand Down
Loading