Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into jsondata-propertyna…
Browse files Browse the repository at this point in the history
…me-casing
  • Loading branch information
annelo-msft committed Feb 27, 2023
2 parents c2467b2 + 0056e28 commit f855ae0
Show file tree
Hide file tree
Showing 6,765 changed files with 393,731 additions and 140,211 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@
# PRLabel: %Communication - Resource Manager
/sdk/communication/Azure.ResourceManager.Communication/ @fengzhou-msft @archerzz @ArcturusZhang @Yao725 @ArthurMa1978

# PRLabel: %Communication - Rooms
/sdk/communication/Azure.Communication.Rooms/ @minnieliu @paolamvhz @alexokun @Mrayyan @shwali-msft @allchiang-msft @mikehang-msft

# ServiceLabel: %Compute %Service Attention
#/<NotInRepo>/ @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @jaylabell @sandeepraichura @hilaryw29 @MsGabsta

Expand Down
6 changes: 6 additions & 0 deletions .github/fabricbot.json
Original file line number Diff line number Diff line change
Expand Up @@ -1085,6 +1085,12 @@
"/sdk/communication/Azure.ResourceManager.Communication/"
]
},
{
"label": "Communication - Rooms",
"pathFilter": [
"/sdk/communication/Azure.Communication.Rooms/"
]
},
{
"label": "Mixed Reality",
"pathFilter": [
Expand Down
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.
4 changes: 2 additions & 2 deletions doc/dev/Using-Mock-Test-Generation.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The Mgmt mock tests can be generated by below steps:
~~~
# Generated test code configuration
Run `dotnet build /t:GenerateTest` to generate test code.
Run `dotnet build /t:GenerateTests` to generate test code.
``` yaml
require:
Expand All @@ -62,7 +62,7 @@ The Mgmt mock tests can be generated by below steps:
[or USE dotnet target]
~~~
> dotnet build /t:GenerateTest
> dotnet build /t:GenerateTests
~~~
The generated results looks like below:
Expand Down
2 changes: 1 addition & 1 deletion doc/dev/mgmt_quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ await foreach (VirtualMachineResource virtualMachine in virtualMachines)
```

## Structured Resource Identifier
Resource IDs contain useful information about the resource itself, but they are plain strings that have to be parsed. Instead of implementing your own parsing logic, you can use a `ResourceIdentifier` object which will do the parsing for you: `new ResourceIdentifer("myid");`.
Resource IDs contain useful information about the resource itself, but they are plain strings that have to be parsed. Instead of implementing your own parsing logic, you can use a `ResourceIdentifier` object which will do the parsing for you: `new ResourceIdentifier("myid");`.

### Example: Parsing an ID using a ResourceIdentifier object
```C# Snippet:Readme_CastToSpecificType
Expand Down
24 changes: 14 additions & 10 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />

<!-- OpenTelemetry dependency approved for Azure.Monitor.OpenTelemetry.Exporter package only -->
<PackageReference Update="OpenTelemetry" Version="[1.4.0-rc.4]" Condition="'$(MSBuildProjectName)' == 'Azure.Monitor.OpenTelemetry.Exporter'" />
<PackageReference Update="OpenTelemetry" Version="1.4.0" Condition="'$(MSBuildProjectName)' == 'Azure.Monitor.OpenTelemetry.Exporter'" />
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
<PackageReference Update="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc9.14" />
<PackageReference Update="OpenTelemetry.Extensions.PersistentStorage" Version="1.0.0-beta.1" Condition="'$(MSBuildProjectName)' == 'Azure.Monitor.OpenTelemetry.Exporter'" />
</ItemGroup>

Expand Down Expand Up @@ -160,7 +164,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.20230212.4" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20230227.1" 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 Expand Up @@ -198,7 +202,7 @@
<PackageReference Update="Azure.Security.KeyVault.Secrets" Version="4.2.0-beta.4" />
<PackageReference Update="Azure.Storage.Blobs" Version="12.13.1" />
<PackageReference Update="Azure.Storage.Files.DataLake" Version="12.8.0" />
<PackageReference Update="BenchmarkDotNet" Version="0.13.1" />
<PackageReference Update="BenchmarkDotNet" Version="0.13.4" />
<PackageReference Update="Castle.Core" Version="5.1.0" />
<PackageReference Update="CommandLineParser" Version="2.8.0" />
<PackageReference Update="FluentAssertions" Version="5.10.3" />
Expand Down Expand Up @@ -239,7 +243,7 @@
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="2.1.10" />
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.32" />
<PackageReference Update="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
<PackageReference Update="Microsoft.Graph" Version="4.52.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
Expand All @@ -255,11 +259,11 @@
<PackageReference Update="NSubstitute" Version="3.1.0" />
<PackageReference Update="NUnit" Version="3.13.2" />
<PackageReference Update="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.4.0-rc.4" />
<PackageReference Update="OpenTelemetry.Exporter.InMemory" Version="1.4.0" />
<PackageReference Update="OpenTelemetry.Extensions.AzureMonitor" Version="1.0.0-beta.3" />
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.4.0-rc.4" />
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.13" />
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.13" />
<PackageReference Update="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
<PackageReference Update="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.14" />
<PackageReference Update="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
<PackageReference Update="Polly" Version="7.1.0" />
<PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
<PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
Expand All @@ -278,8 +282,8 @@
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
<PackageDownload Include="Azure.Sdk.Tools.Testproxy" Version="[$(TestProxyVersion)]" />
<PackageReference Update="WindowsAzure.ServiceBus" Version="5.1.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Update="xunit" Version="2.4.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
Expand Down
15 changes: 9 additions & 6 deletions eng/common/pipelines/templates/jobs/perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@ parameters:
- name: JobName
type: string
default: 'Perf'
- name: TimeoutInMinutes
type: number
default: '360'
- name: LinuxPool
type: string
default: 'azsdk-pool-mms-ubuntu-2004-perf'
default: 'azsdk-pool-mms-ubuntu-2204-perf'
- name: LinuxVmImage
type: string
default: 'MMSUbuntu20.04'
default: 'ubuntu-22.04'
- name: WindowsPool
type: string
default: 'azsdk-pool-mms-win-2019-perf'
default: 'azsdk-pool-mms-win-2022-perf'
- name: WindowsVmImage
type: string
default: 'MMS2019'
default: 'windows-2022'
- name: Language
type: string
default: ''
Expand Down Expand Up @@ -65,7 +68,7 @@ parameters:

jobs:
- job: ${{ parameters.JobName }}
timeoutInMinutes: 360
timeoutInMinutes: ${{ parameters.TimeoutInMinutes }}
strategy:
matrix:
${{ if contains(parameters.OperatingSystems, 'Linux') }}:
Expand Down Expand Up @@ -109,7 +112,7 @@ jobs:
- 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
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stages:
matrix:
Windows:
Pool: 'azsdk-pool-mms-win-2022-general'
Image: 'MMS2022'
Image: 'windows-2022'
Linux:
Pool: azsdk-pool-mms-ubuntu-2204-general
Image: MMSUbuntu22.04
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
Loading

0 comments on commit f855ae0

Please sign in to comment.