Skip to content

Commit

Permalink
Merge branch 'main' into planned-maintenence-04-23
Browse files Browse the repository at this point in the history
  • Loading branch information
Harshit-Shrivastava committed Feb 22, 2023
2 parents 28e1c56 + a35b015 commit f1243fb
Show file tree
Hide file tree
Showing 1,781 changed files with 137,159 additions and 66,769 deletions.
21 changes: 20 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,12 @@
"tcpkeepalive",
"wasi",
"wmem",
"Oidc"
"Oidc",
"Ebpf",
"Ipvs",
"Keda",
"Kata",
"Mshv"
]
},
{
Expand Down Expand Up @@ -728,6 +733,12 @@
"Puid"
]
},
{
"filename": "**/sdk/resourcehealth/**/*.cs",
"words": [
"occured"
]
},
{
"filename": "**/sdk/servicefabricmanagedclusters/**/*.cs",
"words": [
Expand Down Expand Up @@ -980,6 +991,14 @@
"Orgs"
]
},
{
"filename": "**/sdk/voiceservices/**/*.cs",
"words": [
"Esrp",
"Pcma",
"Pcmu"
]
},
{
"filename": "**/sdk/webpubsub/**/*.cs",
"words": [
Expand Down
20 changes: 20 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -543,3 +543,23 @@ For information about breaking changes see [Breaking Change Rules](https://githu
## Debugging

The libraries shipped out of this repo have [source link](https://docs.microsoft.com/dotnet/standard/library-guidance/sourcelink#using-source-link) enabled. Source link allows for symbols to be dynamically loaded while debugging, which allows you to step into the Azure SDK source code. This is often helpful when trying to step into Azure.Core code, as it is a package reference for most libraries. To enable using source link with the Azure SDK libraries in Visual Studio, you will need to check off Microsoft Symbol Servers as one of your Symbol file locations. Additionally, make sure that "Just My Code" is **_NOT_** enabled.

## Samples

### Third-party dependencies

Third party libraries should only be included in samples when necessary to demonstrate usage of an Azure SDK package; they should not be suggested or endorsed as alternatives to the Azure SDK.

When code samples take dependencies, readers should be able to use the material without significant license burden or research on terms. This goal requires restricting dependencies to certain types of open source or commercial licenses.

Samples may take the following categories of dependencies:

- **Open-source** : Open source offerings that use an [Open Source Initiative (OSI) approved license](https://opensource.org/licenses). Any component whose license isn't OSI-approved is considered a commercial offering. Prefer OSS projects that are members of any of the [OSS foundations that Microsoft is part of](https://opensource.microsoft.com/ecosystem/). Prefer permissive licenses for libraries, like [MIT](https://opensource.org/licenses/MIT) and [Apache 2](https://opensource.org/licenses/Apache-2.0). Copy-left licenses like [GPL](https://opensource.org/licenses/gpl-license) are acceptable for tools, and OSs. [Kubernetes](https://github.com/kubernetes/kubernetes), [Linux](https://github.com/torvalds/linux), and [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) are examples of this license type. Links to open source components should be to where the source is hosted, including any applicable license, such as a GitHub repository (or similar).

- **Commercial**: Commercial offerings that enable readers to learn from our content without unnecessary extra costs. Typically, the offering has some form of a community edition, or a free trial sufficient for its use in content. A commercial license may be a form of dual-license, or tiered license. Links to commercial components should be to the commercial site for the software, even if the source software is hosted publicly on GitHub (or similar).

- **Dual licensed**: Commercial offerings that enable readers to choose either license based on their needs. For example, if the offering has an OSS and commercial license, readers can choose between them. [MySql](https://github.com/mysql/mysql-server) is an example of this license type.

- **Tiered licensed**: Offerings that enable readers to use the license tier that corresponds to their characteristics. For example, tiers may be available for students, hobbyists, or companies with defined revenue thresholds. For offerings with tiered licenses, strive to limit our use in tutorials to the features available in the lowest tier. This policy enables the widest audience for the article. [Docker](https://www.docker.com/), [IdentityServer](https://duendesoftware.com/products/identityserver), [ImageSharp](https://sixlabors.com/products/imagesharp/), and [Visual Studio](https://visualstudio.com) are examples of this license type.

In general, we prefer taking dependencies on licensed components in the order of the listed categories. In cases where the category may not be well known, we'll document the category so that readers understand the choice that they're making by using that dependency.
2 changes: 1 addition & 1 deletion eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
All should have PrivateAssets="All" set so they don't become package dependencies
-->
<ItemGroup>
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20230217.3" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20230221.3" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20230131.1" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
Expand Down
13 changes: 13 additions & 0 deletions eng/common/pipelines/templates/jobs/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@ parameters:
- name: LinuxPool
type: string
default: 'azsdk-pool-mms-ubuntu-2204-perf'
- name: LinuxVmImage
type: string
default: 'ubuntu-22.04'
- name: WindowsPool
type: string
default: 'azsdk-pool-mms-win-2022-perf'
- name: WindowsVmImage
type: string
default: 'windows-2022'
- name: Language
type: string
default: ''
Expand Down Expand Up @@ -68,10 +74,12 @@ jobs:
${{ if contains(parameters.OperatingSystems, 'Linux') }}:
Linux:
Pool: ${{ parameters.LinuxPool }}
OsVmImage: ${{ parameters.LinuxVmImage }}
MatrixName: 'Linux'
${{ if contains(parameters.OperatingSystems, 'Windows') }}:
Windows:
Pool: ${{ parameters.WindowsPool }}
OsVmImage: ${{ parameters.WindowsVmImage }}
MatrixName: 'Windows'
variables:
- ${{ parameters.Variables }}
Expand All @@ -82,6 +90,7 @@ jobs:
value: ''
pool:
name: $(Pool)
vmImage: $(OSVmImage)
steps:

- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
Expand All @@ -100,6 +109,10 @@ jobs:
Commitish: ${{ parameters.ToolsRepoCommitish }}
WorkingDirectory: $(System.DefaultWorkingDirectory)/azure-sdk-tools

- template: /eng/common/pipelines/templates/steps/verify-agent-os.yml
parameters:
AgentImage: $(OSVmImage)

- ${{ parameters.InstallLanguageSteps }}

- template: /eng/common/TestResources/deploy-test-resources.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/common/pipelines/templates/steps/check-spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ steps:
- task: NodeTool@0
condition: and(succeededOrFailed(), ne(variables['Skip.SpellCheck'],'true'))
inputs:
versionSpec: 18.x
displayName: Use Node.js 18.x
versionSpec: 18.13.0
displayName: Use Node.js 18.13.0

- task: PowerShell@2
displayName: Check spelling (cspell)
Expand Down
2 changes: 1 addition & 1 deletion eng/emitter-package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"main": "dist/src/index.js",
"dependencies": {
"@azure-tools/cadl-csharp": "0.1.11-beta.20230216.5"
"@azure-tools/cadl-csharp": "0.1.11-beta.20230221.2"
}
}
2 changes: 1 addition & 1 deletion eng/pipelines/mgmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resources:
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools
ref: refs/tags/azure-sdk-build-tools_20230206.1
ref: refs/tags/azure-sdk-build-tools_20230221.2

parameters:
- name: ShouldPublishToNuget
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resources:
- repository: azure-sdk-build-tools
type: git
name: internal/azure-sdk-build-tools
ref: refs/tags/azure-sdk-build-tools_20230206.1
ref: refs/tags/azure-sdk-build-tools_20230221.2

parameters:
- name: Artifacts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"227B2010-BBFC-46F8-84BB-236E9F3A0176",
"3123B983-4452-4B29-8E9A-849867BEC1E6",
"61FB8E18-94E3-4A8F-B6B3-E765F85000F5",
"11EAD7A0-B5E6-4145-B1F1-37A2D9091E07"
"11EAD7A0-B5E6-4145-B1F1-37A2D9091E07",
"18F152D5-2ECB-43E8-ADFC-EC3EA3F68843"
],
"sources": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.ResourceManager.Templ
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.ResourceManager.Template.Tests", "tests\Azure.ResourceManager.Template.Tests.csproj", "{11EAD7A0-B5E6-4145-B1F1-37A2D9091E07}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.ResourceManager.Template.Samples", "samples\Azure.ResourceManager.Template.Samples.csproj", "{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}"
EndProject
Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -47,5 +49,17 @@ Global
{11EAD7A0-B5E6-4145-B1F1-37A2D9091E07}.Release|x64.Build.0 = Release|Any CPU
{11EAD7A0-B5E6-4145-B1F1-37A2D9091E07}.Release|x86.ActiveCfg = Release|Any CPU
{11EAD7A0-B5E6-4145-B1F1-37A2D9091E07}.Release|x86.Build.0 = Release|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Debug|x64.ActiveCfg = Debug|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Debug|x64.Build.0 = Debug|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Debug|x86.ActiveCfg = Debug|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Debug|x86.Build.0 = Debug|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Release|Any CPU.Build.0 = Release|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Release|x64.ActiveCfg = Release|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Release|x64.Build.0 = Release|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Release|x86.ActiveCfg = Release|Any CPU
{18F152D5-2ECB-43E8-ADFC-EC3EA3F68843}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Azure.Identity"/>
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\src\Azure.ResourceManager.Template.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@

### Other Changes

## 1.0.1 (2023-02-20)

### Features Added

- Introduced property bag for the methods with more than 5 parameters.

### Other Changes

- Upgraded dependent `Azure.Core` to `1.28.0`.
- Upgraded dependent `Azure.ResourceManager` to `1.4.0`.

## 1.0.0 (2022-09-19)

This release is the first stable release of the AlertsManagement Management client library.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Version>1.1.0-beta.1</Version>
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
<ApiCompatVersion>1.0.0</ApiCompatVersion>
<ApiCompatVersion>1.0.1</ApiCompatVersion>
<PackageId>Azure.ResourceManager.AlertsManagement</PackageId>
<Description>Microsoft Azure Resource Manager client SDK for Azure resource provider Microsoft.AlertsManagement.</Description>
<PackageTags>azure;management;arm;resource manager;alertsmanagement</PackageTags>
Expand Down

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@

### Other Changes

## 1.0.1 (2023-02-20)

### Other Changes

- Upgraded dependent `Azure.Core` to `1.28.0`.
- Upgraded dependent `Azure.ResourceManager` to `1.4.0`.

## 1.0.0 (2022-09-05)

This release is the first stable release of the Authorization Management client library.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Version>1.1.0-beta.1</Version>
<!--The ApiCompatVersion is managed automatically and should not generally be modified manually.-->
<ApiCompatVersion>1.0.0</ApiCompatVersion>
<ApiCompatVersion>1.0.1</ApiCompatVersion>
<PackageId>Azure.ResourceManager.Authorization</PackageId>
<Description>Microsoft Azure Resource Manager client SDK for Azure resource provider Microsoft.Authorization.</Description>
<PackageTags>azure;management;arm;resource manager;authorization</PackageTags>
Expand Down
27 changes: 24 additions & 3 deletions sdk/automanage/Azure.ResourceManager.Automanage/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
# Release History

## 1.0.0-beta.2 (Unreleased)
## 1.1.0-beta.1 (Unreleased)

### Features Added

### Breaking Changes

- Temporarily removed two operations `ConfigurationProfileAssignments_List` and `ConfigurationProfileAssignments_ListBySubscription`

### Bugs Fixed

### Other Changes

## 1.0.0 (2023-02-21)

This is the first stable release of the Azure Automanage management library.

### Features Added

- Added the methods `GetServicePrincipals` and `GetServicePrincipal`.
- Added a new resource `AutomanageConfigurationProfileVersionResource`.

### Breaking Changes

- Temporarily removed two operations `ConfigurationProfileAssignments_List` and `ConfigurationProfileAssignments_ListBySubscription`
- Polishing since last public beta release:
>1. Prepended `Automanage` prefix to all single / simple model names.
>2. Corrected the format of all `ResourceIdentifier` type properties / parameters.
>3. Corrected the suffix of `DateTimeOffset` properties / parameters.
>4. Optimized the name of some models and functions.
### Other Changes

- Upgraded dependent `Azure.Core` to `1.28.0`.
- Upgraded dependent `Azure.ResourceManager` to `1.4.0`.

## 1.0.0-beta.1 (2022-09-14)

### Breaking Changes
Expand Down
4 changes: 2 additions & 2 deletions sdk/automanage/Azure.ResourceManager.Automanage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This library follows the [new Azure SDK guidelines](https://azure.github.io/azur
Install the Microsoft Azure Automanage management library for .NET with [NuGet](https://www.nuget.org/):

```dotnetcli
dotnet add package Azure.ResourceManager.Automanage --prerelease
dotnet add package Azure.ResourceManager.Automanage
```

### Prerequisites
Expand Down Expand Up @@ -83,4 +83,4 @@ more information see the [Code of Conduct FAQ][coc_faq] or contact
<!-- LINKS -->
[cg]: https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/resourcemanager/Azure.ResourceManager/docs/CONTRIBUTING.md
[coc]: https://opensource.microsoft.com/codeofconduct/
[coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
[coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
Loading

0 comments on commit f1243fb

Please sign in to comment.