Skip to content

Commit

Permalink
Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…
Browse files Browse the repository at this point in the history
…sdk-for-net into mgmt-track2
  • Loading branch information
m-nash committed May 10, 2021
2 parents 9597dc7 + 5e6030f commit 86547b0
Show file tree
Hide file tree
Showing 732 changed files with 75,399 additions and 35,006 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
# ServiceLabel: %Compute - VMSS %Service Attention
#/<NotInRepo>/ @Drewm3 @avirishuv

# PRLabel: %Confidential Ledger
/sdk/confidentialledger/ @christothes

# ServiceLabel: %Consumption %Service Attention
/sdk/consumption/Microsoft.Azure.Management.Consumption/ @ms-premp

Expand Down
37 changes: 37 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"version": "0.1",
"language": "en_US",
"languageId": "csharp",
"dictionaries": ["powershell"],
"ignorePaths": [
"**/SessionRecords/**",
"**/packages/**",
"artifacts/**/*",
"*.exe",
"*.dll",
"*.nupkg",
"*.bmp",
"*.png",
"*.gif",
"*.jpg",
"*.tiff",
"*.wav",
"*.pdf",
"*.zip",
"*.sha512",
"*.ico",
"*.pri",
".vscode/cspell.json"
],
// cspell is not case sensitive
// Sort words alphabetically to make this list easier to use
"words": ["azsdk", "pwsh"],
"overrides": [
{ "filename": "**/sdk/formrecognizer/**/*.cs", "words": ["ZhHant"] },
{
"filename": "**/eng/pipelines/templates/jobs/ci.yml",
"words": ["warnaserror"]
}
],
"allowCompoundWords": true
}
29 changes: 29 additions & 0 deletions SUPPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Support

## How to file issues and get help  

Customers with a [support plan](https://azure.microsoft.com/en-us/support/options/) can open an Azure Support ticket [here](https://azure.microsoft.com/support/create-ticket/).
**We recommend this option if your problem requires immediate attention.**

### Community resources
- Ask a question on [StackOverflow](https://stackoverflow.com/questions/tagged/azure-sdk-.net) and tag it with azure-sdk-.net
- Share or upvote feature requests on [Feedback Page](https://feedback.azure.com/forums/34192--general-feedback).
- Take a look at the [Azure SDK blog](https://devblogs.microsoft.com/azure-sdk/).
- Chat with other community members on [gitter](https://gitter.im/Azure/azure-sdk-for-net?source=orgpage)
- Ask a question on [Twitter](https://twitter.com/AzureSDK)
- Ask a question at [Microsoft Q&A](https://docs.microsoft.com/answers/products/azure?WT.mc_id=Portal-Microsoft_Azure_Support&product=all)
- Ask a question at [Microsoft Tech Community](https://techcommunity.microsoft.com/t5/azure/ct-p/Azure)
- Search for similar issues in [our GitHub repository](https://github.com/Azure/azure-sdk-for-net/issues)

### Security bugs
Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center(secure@microsoft.com).
You should receive a response within 24 hours.
Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://www.microsoft.com/msrc/faqs-report-an-issue?rtc=1)

### Github issues
We use [GitHub Issues](https://github.com/Azure/azure-sdk-for-net/issues/new/choose) to track bugs, questions, and feature requests.
GitHub issues are free, but **response time is not guaranteed.** See [GitHub issues support process](https://devblogs.microsoft.com/azure-sdk/github-issue-support-process/) for more details.

## Microsoft Support Policy

Please refer to [Azure SDK Support and Lifecycle information](https://azure.github.io/azure-sdk/policies_support.html)
1 change: 1 addition & 0 deletions eng/.docsettings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ known_presence_issues:
- ['sdk/cognitiveservices/Vision.Face','#5499']
- ['sdk/cognitiveservices/Vision.FormRecognizer','#5499']
- ['sdk/containerregistry/Microsoft.Azure.ContainerRegistry','#5499']
- ['sdk/eventgrid/Azure.Messaging.EventGrid/EventGridSourceGenerator','#5499']
- ['sdk/eventgrid/Microsoft.Azure.EventGrid','#5499']
- ['sdk/eventhub/Microsoft.Azure.EventHubs.Processor','#5499']
- ['sdk/eventhub/Microsoft.Azure.EventHubs.ServiceFabricProcessor','#5499']
Expand Down
4 changes: 2 additions & 2 deletions eng/CHECKENFORCER
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
format: v0.1-alpha
minimumCheckRuns: 1
timeout: 5
timeout: 10
message: >
This pull request is protected by [Check Enforcer](https://aka.ms/azsdk/check-enforcer).

Expand Down Expand Up @@ -62,4 +62,4 @@ message: >
## For track 1 management-plane SDKs

Please open a separate PR and to your service SDK path in [this file](https://github.com/Azure/azure-sdk-for-net/blob/master/eng/pipelines/mgmt.yml). Once that PR has been merged, you can re-run the pipeline to trigger the verification.


5 changes: 4 additions & 1 deletion eng/Directory.Build.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@
<RequiredTargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net461;netcoreapp2.1;netcoreapp3.1;net5.0</RequiredTargetFrameworks>
</PropertyGroup>

<Import Project="$(RepoRoot)/sdk/core/Azure.Core/src/Azure.Core.props" Condition="'$(IsMgmtLibrary)' == 'true'"/>
<ItemGroup Condition="'$(IsMgmtLibrary)' == 'true'">
<PackageReference Include="Azure.Core" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

<PropertyGroup>
<TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
Expand Down
12 changes: 7 additions & 5 deletions eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,10 @@
<PackageReference Update="Microsoft.CSharp" Version="4.5.0" />

<!-- Azure SDK packages -->
<PackageReference Update="Azure.Core" Version="1.13.0" />
<PackageReference Update="Azure.Communication.Common" Version="1.0.0" />
<PackageReference Update="Azure.Core" Version="1.14.0" />
<PackageReference Update="Azure.Core.Amqp" Version="1.1.0-beta.1" Condition="'$(HasReleaseVersion)' == 'false'"/>
<PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.10" />
<PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.12" />
<PackageReference Update="Azure.Messaging.EventHubs" Version="5.4.0" />
<PackageReference Update="Azure.Messaging.EventGrid" Version="4.0.0" />
<PackageReference Update="Azure.Messaging.ServiceBus" Version="7.2.0-beta.2" Condition="'$(HasReleaseVersion)' == 'false'"/>
Expand All @@ -89,8 +90,8 @@

<!-- Other approved packages -->
<PackageReference Update="Microsoft.Azure.Amqp" Version="2.4.13" />
<PackageReference Update="Microsoft.Identity.Client" Version="4.23.0" />
<PackageReference Update="Microsoft.Identity.Client.Extensions.Msal" Version="2.16.6" />
<PackageReference Update="Microsoft.Identity.Client" Version="4.30.1" />
<PackageReference Update="Microsoft.Identity.Client.Extensions.Msal" Version="2.18.4" />
<!-- TODO: Make sure this package is arch-board approved -->
<PackageReference Update="System.IdentityModel.Tokens.Jwt" Version="5.4.0" />

Expand Down Expand Up @@ -128,7 +129,7 @@
All should have PrivateAssets="All" set so they don't become pacakge dependencies
-->
<ItemGroup>
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210504.2" PrivateAssets="All" />
<PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210505.1" PrivateAssets="All" />
<PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20210322.2" PrivateAssets="All" />
<PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />
Expand All @@ -138,6 +139,7 @@
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Update="SauceControl.InheritDoc" Version="1.2.0" PrivateAssets="All" />
<PackageReference Update="StyleCop.Analyzers" Version="1.2.0-beta.333" PrivateAssets="All" />
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version ="3.9.0" PrivateAssets="all" />
</ItemGroup>

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@ steps:
condition: succeeded()
- pwsh: |
$setDailyDevBuild = "false"
if (('$(Build.Reason)' -in 'Schedule', 'IndividualCI') -and ('$(System.TeamProject)' -eq 'internal')) {
if (('$(Build.Reason)' -eq 'Schedule') -and ('$(System.TeamProject)' -eq 'internal')) {
$setDailyDevBuild = "true"
}
echo "##vso[task.setvariable variable=SetDevVersion]$setDailyDevBuild"
displayName: "Setup Versioning Properties"
condition: eq(variables['SetDevVersion'], '')
- pwsh: |
echo "##vso[task.setvariable variable=SetDevVersion;isOutput=true]$(SetDevVersion)"
name: VersioningProperties
displayName: "Export Versioning Properties"
5 changes: 5 additions & 0 deletions eng/common/scripts/Prepare-Release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ if ($null -eq $newVersionParsed)
-packageType $packageProperties.SDKType `
-packageNewLibrary $packageProperties.IsNewSDK

if ($LASTEXITCODE -ne 0) {
Write-Error "Updating of the Devops Release WorkItem failed."
exit 1
}

if ($releaseTrackingOnly)
{
Write-Host
Expand Down
10 changes: 8 additions & 2 deletions eng/common/scripts/Update-DevOps-Release-WorkItem.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,17 @@ param(
Set-StrictMode -Version 3

if (!(Get-Command az -ErrorAction SilentlyContinue)) {
Write-Host 'You must have the Azure CLI installed: https://aka.ms/azure-cli'
Write-Error 'You must have the Azure CLI installed: https://aka.ms/azure-cli'
exit 1
}

az extension show -n azure-devops > $null
az account show *> $null
if (!$?) {
Write-Host 'Running az login...'
az login *> $null
}

az extension show -n azure-devops *> $null
if (!$?){
Write-Host 'Installing azure-devops extension'
az extension add --name azure-devops
Expand Down
4 changes: 2 additions & 2 deletions eng/mgmt/mgmtmetadata/extendedlocation_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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/extendedlocation/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\Users\amalladi\test-apps\azure-sdk-for-net\sdk
2021-03-19 05:26:08 UTC
2021-05-03 15:47:00 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 86aebe0f4e974b72dffe19a293465a76d664f8e0
Commit: dceaa75fe47854ad7b0fcc0c7cf38677b4bb181f
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413
4 changes: 2 additions & 2 deletions eng/mgmt/mgmtmetadata/iothub_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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/iothub/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2020-03 --csharp-sdks-folder=C:\code\Azure\asfn1\sdk
2021-02-17 20:16:51 UTC
2021-05-05 18:24:00 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 55131eaf8fb4722171769ba175791ad45ae3d969
Commit: a394eccc2ce26369cacbc113cf0c3a9c9501e689
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413
6 changes: 3 additions & 3 deletions eng/mgmt/mgmtmetadata/resources_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ 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-templatespecs-2021-03-preview --csharp.output-folder=C:\repos\azure-sdk-for-net\sdk\resources\Microsoft.Azure.Management.Resource\src\Generated\TemplateSpecs
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-templatespecs-2021-05 --csharp.output-folder=C:\repos\azure-sdk-for-net\sdk\resources\Microsoft.Azure.Management.Resource\src\Generated\TemplateSpecs
Autorest CSharp Version: 2.3.82
2021-04-20 23:49:12 UTC
2021-05-04 21:49:01 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 5047dfdf585969892ac035ffdfbc57623f0bf1c5
Commit: a7292a40170e8ebb10ad12332022798c2fe72f8a
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413
13 changes: 13 additions & 0 deletions eng/pipelines/aggregate-reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@ jobs:
artifact: packages
patterns: '*'

- pwsh: |
npx cspell lint `
--config ./.vscode/cspell.json `
./sdk/**/api/*.cs
displayName: Check spelling of public API surface
# Spelling errors in public api surface are not blockers yet but will
# become blockers when this is rolled out to all services. For now, turn
# the pipeline yellow if spelling errors are detected but do not block.
# Individual services can be blocked on spelling errors using:
# `SpellCheckPublicApiSurface: true`
# in the archetype-sdk-client.yml template invocation
continueOnError: true
- template: /eng/common/pipelines/templates/steps/verify-links.yml
parameters:
Directory: ""
Expand Down
5 changes: 5 additions & 0 deletions eng/pipelines/templates/jobs/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ parameters:
- name: MatrixReplace
type: object
default: []
- name: SpellCheckPublicApiSurface
type: boolean
default: false

jobs:
- job: Build
Expand Down Expand Up @@ -100,6 +103,7 @@ jobs:
name: azsdk-pool-mms-ubuntu-1804-general
vmImage: MMSUbuntu18.04
steps:
- template: /eng/common/pipelines/templates/steps/check-spelling.yml
- task: UsePythonVersion@0
displayName: "Use Python 3.6"
inputs:
Expand Down Expand Up @@ -135,6 +139,7 @@ jobs:
arguments: >
-ServiceDirectory ${{ parameters.ServiceToTest }}
-SDKType ${{ parameters.SDKType }}
-SpellCheckPublicApiSurface:$${{ parameters.SpellCheckPublicApiSurface }}
pwsh: true
failOnStderr: false
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
Expand Down
6 changes: 1 addition & 5 deletions eng/pipelines/templates/stages/archetype-net-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ stages:
- stage: Release_${{artifact.safeName}}
displayName: 'Release: ${{artifact.name}}'
dependsOn: Signing
variables:
SetDevVersion: $[stageDependencies.Build.Build.outputs['VersioningProperties.SetDevVersion']]
condition: and(succeeded(), ne(variables['SetDevVersion'], 'true'), ne(variables['Skip.Release'], 'true'), ne(variables['Build.Repository.Name'], 'Azure/azure-sdk-for-net-pr'))
jobs:
- deployment: TagRepository
Expand Down Expand Up @@ -241,11 +239,9 @@ stages:

- stage: Integration
dependsOn: Signing
variables:
SetDevVersion: $[stageDependencies.Build.Build.outputs['VersioningProperties.SetDevVersion']]
jobs:
- job: PublishPackages
condition: and(eq(variables['SetDevVersion'], 'true'), eq(variables['System.TeamProject'], 'internal'))
condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal')))
displayName: Publish package to daily feed
variables:
BlobFeedUrl: 'https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-net/index.json'
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ parameters:
- name: MatrixReplace
type: object
default: []
- name: SpellCheckPublicApiSurface
type: boolean
default: false

variables:
- template: ../variables/globals.yml
Expand All @@ -71,6 +74,7 @@ stages:
ArtifactName: packages
TestSetupSteps: ${{ parameters.TestSetupSteps }}
TestTimeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
SpellCheckPublicApiSurface: ${{ parameters.SpellCheckPublicApiSurface }}
MatrixConfigs:
- ${{ each config in parameters.MatrixConfigs }}:
- ${{ config }}
Expand Down
7 changes: 5 additions & 2 deletions eng/scripts/CodeChecks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ param (
[string] $ProjectDirectory,

[Parameter()]
[string] $SDKType = "all"
[string] $SDKType = "all",

[Parameter()]
[switch] $SpellCheckPublicApiSurface
)

$ErrorActionPreference = 'Stop'
Expand Down Expand Up @@ -87,7 +90,7 @@ try {

Write-Host "Re-generating listings"
Invoke-Block {
& $PSScriptRoot\Export-API.ps1 -ServiceDirectory $ServiceDirectory -SDKType $SDKType
& $PSScriptRoot\Export-API.ps1 -ServiceDirectory $ServiceDirectory -SDKType $SDKType -SpellCheckPublicApiSurface:$SpellCheckPublicApiSurface
}

if (-not $ProjectDirectory)
Expand Down
18 changes: 17 additions & 1 deletion eng/scripts/Export-API.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,25 @@ param (
[Parameter(Position=0)]
[ValidateNotNullOrEmpty()]
[string] $ServiceDirectory,
[string] $SDKType = "all"
[string] $SDKType = "all",
[switch] $SpellCheckPublicApiSurface
)

if ($SpellCheckPublicApiSurface -and -not (Get-Command 'npx')) {
Write-Error "Could not locate npx. Install NodeJS (includes npm and npx) https://nodejs.org/en/download/"
exit 1
}

$servicesProj = Resolve-Path "$PSScriptRoot/../service.proj"

dotnet build /t:ExportApi /p:RunApiCompat=false /p:InheritDocEnabled=false /p:GeneratePackageOnBuild=false /p:Configuration=Release /p:IncludeSamples=false /p:IncludePerf=false /p:IncludeStress=false /p:IncludeTests=false /p:Scope="$ServiceDirectory" /p:SDKType=$SDKType /restore $servicesProj

if ($SpellCheckPublicApiSurface) {
Write-Host "Spell check public API surface"
npx cspell lint `
--config "$PSScriptRoot/../../.vscode/cspell.json" `
"$PSScriptRoot/../../sdk/$ServiceDirectory/*/api/*.cs"
if ($LASTEXITCODE) {
Write-Host "##vso[task.LogIssue type=error;]Spelling errors detected. To correct false positives or learn about spell checking see: https://aka.ms/azsdk/engsys/spellcheck"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Core" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

Expand All @@ -28,6 +29,4 @@
<Compile Include="$(AzureCoreSharedSources)TaskExtensions.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
</ItemGroup>

<Import Project="$(MSBuildThisFileDirectory)..\..\..\core\Azure.Core\src\Azure.Core.props" />

</Project>
Loading

0 comments on commit 86547b0

Please sign in to comment.