Skip to content

Commit 9ec1961

Browse files
authored
Revert "Merge from master and merge Disk and Gallery test changes that were previously released (#21167)" (#21193)
This reverts commit 6e2fa32.
1 parent 6e2fa32 commit 9ec1961

File tree

11,493 files changed

+1047271
-1732171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

11,493 files changed

+1047271
-1732171
lines changed

.github/CODEOWNERS

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@
7373
#/<NotInRepo>/ @antcp @AzureAppServiceCLI
7474

7575
# ServiceLabel: %Attestation %Service Attention
76-
/sdk/attestation/ @anilba06 @larryosterman
77-
/sdk/attestation/azure-security-attestation @larryosterman @Azure/azure-sdk-write-attestation @anilba06
76+
/sdk/attestation/ @anilba06
7877

7978
# ServiceLabel: %Authorization %Service Attention
8079
/sdk/authorization/Microsoft.Azure.Management.Authorization/ @darshanhs90 @AshishGargMicrosoft
@@ -123,7 +122,7 @@
123122
/sdk/cognitiveservices/Vision.ComputerVision/ @ryogok @TFR258 @tburns10 @areddish @toothache
124123

125124
# ServiceLabel: %Cognitive - Face %Service Attention
126-
/sdk/cognitiveservices/Vision.Face/ @JinyuID @dipidoo @SteveMSFT @TFR258
125+
/sdk/cognitiveservices/Vision.Face/ @JinyuID @dipidoo @SteveMSFT @TFR258
127126

128127
# PRLabel: %Cognitive - Form Recognizer
129128
/sdk/formrecognizer/ @annelo-msft @kinelski @maririos
@@ -147,7 +146,7 @@
147146
#/<NotInRepo>/ @swmachan
148147

149148
# PRLabel: %Cognitive - Translator
150-
/sdk/translation/ @maririos
149+
/sdk/documenttranslation/ @maririos
151150

152151
# ServiceLabel: %Cognitive - Speech %Service Attention
153152
#/<NotInRepo>/ @robch @oscholz
@@ -201,9 +200,6 @@
201200
# ServiceLabel: %Compute - VMSS %Service Attention
202201
#/<NotInRepo>/ @Drewm3 @avirishuv
203202

204-
# PRLabel: %Confidential Ledger
205-
/sdk/confidentialledger/ @christothes
206-
207203
# ServiceLabel: %Consumption %Service Attention
208204
/sdk/consumption/Microsoft.Azure.Management.Consumption/ @ms-premp
209205

@@ -283,23 +279,11 @@
283279
# PRLabel: %Event Grid
284280
/sdk/eventgrid/ @Kishp01 @ahamad-MS @jfggdl @JoshLove-msft
285281

286-
# PRLabel: %Event Grid %Functions
287-
/sdk/eventgrid/Microsoft.Azure.WebJobs.Extensions.EventGrid/ @pakrym @jsquire @JoshLove-msft
288-
289282
# PRLabel: %Event Hubs
290283
/sdk/eventhub/ @serkantkaraca @jsquire
291284

292-
# PRLabel: %Event Hubs %Functions
293-
/sdk/eventhub/eventhub/Microsoft.Azure.WebJobs.Extensions.EventHubs/ @pakrym @JoshLove-msft @jsquire
294-
295-
# ServiceLabel: %Event Hubs %Service Attention
296-
/sdk/eventhub/Microsoft.Azure.EventHubs/ @serkantkaraca @sjkwak
297-
298-
# ServiceLabel: %Event Hubs %Service Attention
299-
/sdk/eventhub/Microsoft.Azure.EventHubs.Processor/ @serkantkaraca @sjkwak
300-
301285
# ServiceLabel: %Event Hubs %Service Attention
302-
/sdk/eventhub/Microsoft.Azure.EventHubs.ServiceFabricProcessor/ @JamesBirdsall @serkantkaraca @sjkwak
286+
/sdk/eventhub/Microsoft.*/ @serkantkaraca @samuelkoppes
303287

304288
# ServiceLabel: %Functions %Service Attention
305289
#/<NotInRepo>/ @ahmedelnably @fabiocav
@@ -388,7 +372,7 @@ sdk/monitor/ @SameergMS @dadunl
388372

389373
# PRLabel: %Monitor - ApplicationInsights
390374
# ServiceLabel: %Monitor - ApplicationInsights %Service Attention
391-
/sdk/applicationinsights/Microsoft.Azure.App*/ @omziv @anatse @raronen @ischrei @danhadari @azmonapplicationinsights
375+
/sdk/applicationinsights/Microsoft.Azure.App*/ @divyajay @geneh @alongafni @azmonapplicationinsights
392376

393377
# ServiceLabel: %Monitor - Autoscale %Service Attention
394378
#/<NotInRepo>/ @AzMonEssential
@@ -477,7 +461,7 @@ sdk/trafficmanager/Microsoft.Azure.Management.TrafficManager/ @tmsupp
477461

478462
# PRLabel: %Operational Insights
479463
# ServiceLabel: %Operational Insights %Service Attention
480-
/sdk/operationalinsights/Microsoft.Azure.Ope*/ @omziv @anatse @raronen @ischrei @danhadari @AzmonLogA
464+
/sdk/operationalinsights/Microsoft.Azure.Ope*/ @divyajay @geneh @alongafni @AzmonLogA
481465

482466
# ServiceLabel: %Policy %Service Attention
483467
#/<NotInRepo>/ @aperezcloud @kenieva
@@ -488,9 +472,6 @@ sdk/trafficmanager/Microsoft.Azure.Management.TrafficManager/ @tmsupp
488472
# ServiceLabel: %PostgreSQL %Service Attention
489473
/sdk/postgresql/Microsoft.Azure.Management.PostgreSQL/ @sunilagarwal @lfittl-msft @sr-msft @niklarin
490474

491-
# ServiceLabel: %Quantum %Service Attention
492-
/sdk/quantum/Azure.Quantum.Jobs/ @xfield
493-
494475
# ServiceLabel: %Recovery Services Backup %Service Attention
495476
/sdk/recoveryservices-backup/Microsoft.Azure.Management.RecoveryServices.Backup/ @pvrk
496477

@@ -522,7 +503,7 @@ sdk/trafficmanager/Microsoft.Azure.Management.TrafficManager/ @tmsupp
522503
#/<NotInRepo>/ @chlahav
523504

524505
# PRLabel: %Search
525-
/sdk/search/ @brjohnstmsft @arv100kri @bleroy @Mohit-Chakraborty @tg-msft
506+
/sdk/search/ @brjohnstmsft @arv100kri @bleroy @Mohit-Chakraborty @tg-msft @heaths
526507

527508
# ServiceLabel: %Search %Service Attention
528509
/sdk/search/Microsoft.*/ @brjohnstmsft @arv100kri @bleroy @tjacobhi @markheff @miwelsh
@@ -531,11 +512,8 @@ sdk/trafficmanager/Microsoft.Azure.Management.TrafficManager/ @tmsupp
531512
# PRLabel: %Service Bus
532513
/sdk/servicebus/ @JoshLove-msft @jsquire
533514

534-
# PRLabel: %Service Bus %Functions
535-
/sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/ @pakrym @JoshLove-msft @jsquire
536-
537515
# ServiceLabel: %Service Bus %Service Attention
538-
/sdk/servicebus/Microsoft.Azure.ServiceBus/ @axisc
516+
/sdk/servicebus/Microsoft.*/ @axisc
539517

540518
# ServiceLabel: %Service Fabric %Service Attention
541519
/sdk/servicefabric/Microsoft.Azure.Management.ServiceFabric/ @QingChenmsft @vaishnavk @juhacket
@@ -616,19 +594,10 @@ sdk/trafficmanager/Microsoft.Azure.Management.TrafficManager/ @tmsupp
616594
# ServiceLabel: %Web Apps %Service Attention
617595
#/<NotInRepo>/ @AzureAppServiceCLI @antcp
618596

619-
# PRLabel: %WebPubSub
620-
/sdk/webpubsub/ @KrzysztofCwalina
621-
622-
# PRLabel: %WebPubSub %Functions
623-
/sdk/webpubsub/Microsoft.Azure.WebJobs.Extensions.WebPubSub/ @vicancy
624-
625-
# ServiceLabel: %WebPubSub %Service Attention
626-
/sdk/webpubsub/ @vicancy @JialinXin
627-
628597
# ######## Management Plane ########
629598

630-
/**/*Management*/ @allenjzhang @m-nash @markcowl @YalinLi0312 @nisha-bhatia
631-
/**/Azure.ResourceManager*/ @allenjzhang @m-nash @markcowl @YalinLi0312 @nisha-bhatia
599+
/**/*Management*/ @allenjzhang @m-nash @markcowl @YalinLi0312 @bquantump @nisha-bhatia
600+
/**/Azure.ResourceManager*/ @allenjzhang @m-nash @markcowl @YalinLi0312 @bquantump @nisha-bhatia
632601

633602
# Reviewers to double check any API changes
634603
/sdk/**/api/ @KrzysztofCwalina @tg-msft
@@ -640,5 +609,5 @@ sdk/trafficmanager/Microsoft.Azure.Management.TrafficManager/ @tmsupp
640609
# ######## Eng Sys ########
641610
/eng/ @weshaggard @chidozieononiwu @mitchdenny @danieljurek
642611
/eng/mgmt/ @allenjzhang @m-nash @markcowl
643-
/**/tests.yml @benbp
612+
/**/tests.yml @danieljurek
644613
/**/ci.yml @mitchdenny

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ Note: Only applies to `Microsoft.Azure.Management.[RP]` or `Azure.ResourceManage
3131
- Do not modify any code in generated folders.
3232
- Do not selectively include/remove generated files in the PR.
3333
- Do use `generate.ps1/cmd` to generate this PR instead of calling `autorest` directly.
34-
Please pay attention to the @microsoft.csharp version output after running `generate.ps1`. If it is lower than current released version (2.3.82), please run it again as it should pull down the latest version.
35-
36-
**Note: We have recently updated the PSH module called by `generate.ps1` to emit additional data. This would help reduce/eliminate the Code Verification check error. Please run following command**:
37-
38-
`dotnet msbuild eng/mgmt.proj /t:Util /p:UtilityName=InstallPsModules`
34+
Please pay attention to the @microsoft.csharp version output after running generate.ps1. If it is lower than current released version (2.3.82), please run it again as it should pull down the latest version,
3935

4036
### Old outstanding PR cleanup
4137
Please note:

.github/pull_request_assignment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
reviewers:
88
- allenjzhang
99
- YalinLi0312
10+
- bquantump
1011
- m-nash
1112
- markcowl
1213
- nisha-bhatia

.vscode/cspell.json

Lines changed: 0 additions & 75 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ When run, the code regions in the format below (where `<snippetName>` is the nam
197197
//some sample code
198198
string snippet = "some snippet code";
199199

200-
// The snippet updater defines the SNIPPET directive while parsing. You can use #if SNIPPET to filter lines in or out of the snippet.
201-
#if SNIPPET
202-
snippet = "value that would never pass a test but looks good in a sample!";
203-
#else
204-
string ignored = "this code will not appear in the snippet markdown";
205-
#endif
200+
// Lines prefixed with the below comment format will be ignored by the snippet updater.
201+
/*@@*/ string ignored = "this code will not appear in the snippet markdown";
202+
203+
// Lines prefixed with the below comment format will appear in the snippet markdown, but will remain comments in the C#` code.
204+
// Note: these comments should only be used for non-critical code as it will not be compiled or refactored as the code changes.
205+
//@@ snippet = "value that would never pass a test but looks good in a sample!";
206206
207207
#endregion
208208
```
@@ -324,16 +324,15 @@ As you can see in the example below, we want to use the `Azure.Data.Tables` vers
324324

325325
## Preparing a new library release
326326

327-
To prepare a package for release you should make use of `.\eng\common\scripts\Prepare-Release.ps1` script passing it appropriate arguments for the package intended for release. This script will correctly update the package version and changelog in the repo as well as update the DevOps release work items for that release.
327+
To prepare a package for release you should make use of `.\eng\common\scripts\Prepare-Release.ps1` script passing it appropriate arguments for the package intended for release as well as the release date. This script will correctly update the package version in the repo as well as update DevOps release work items for that release.
328328

329-
```
330-
.\eng\common\scripts\Prepare-Release.ps1 <PackageName> [<ServiceDirectory>] [<ReleaseDate>] [-ReleaseTrackingOnly]
331-
```
329+
If you are releasing out-of-band please use the `-ReleaseDate` parameter to specify the release data. `ReleaseDate` should be in `yyyy-MM-dd` format.
332330

333-
- `<PackageName>` - Should match the full exact package name for the given ecosystem (i.e. "Azure.Core", "azure-core", "@azure/core", etc).
334-
- `<SerivceDirectory>` - Optional: Should be the exact directory name where the package resides in the repo. This is usually the same as the service name in most cases (i.e. "sdk<service_directory>" e.g. "core"). The parameter is optional and if provided will help speed-up the number of projects we have to parse to find the matching package project.
335-
- `<ReleaseDate>` - Optional: provide a specific date for when you plan to release the package. If one isn't given then one will be calculated based on the normal monthly shipping schedule.
336-
- `<ReleaseTrackingOnly>` - Optional: Switch that if passed will only update the release tracking data in DevOps and not update any versioning info or do validation in the local repo.
331+
Example invocations:
332+
333+
```powershell
334+
.\eng\scripts\Prepare-Release.ps1 -PackageName "Azure.Core" -SerivceDirectory "core" -ReleaseDate "2020-10-01"
335+
```
337336

338337
## On-boarding New Libraries
339338

@@ -524,4 +523,4 @@ For more information on how we version see [Versioning](https://github.com/Azure
524523

525524
## Breaking Changes
526525

527-
For information about breaking changes see [Breaking Change Rules](https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/breaking-change-rules.md)
526+
For information about breaking changes see [Breaking Change Rules](https://github.com/dotnet/corefx/blob/master/Documentation/coding-guidelines/breaking-change-rules.md)

Directory.Build.props

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
<RepoEngPath>$(MSBuildThisFileDirectory)eng</RepoEngPath>
55
<RepoSrcPath>$(RepoRoot)src</RepoSrcPath>
66
<RepoSdkPath>$(RepoRoot)src/SDKs</RepoSdkPath>
7-
<IsLegacyMgmtProject Condition="'$(IsLegacyMgmtProject)' == '' and $(MSBuildProjectName.Contains('.Management.'))">true</IsLegacyMgmtProject>
8-
<ProjectStartsWithStandardName Condition="$(MSBuildProjectName.StartsWith('Azure.')) or $(MSBuildProjectName.StartsWith('Microsoft.'))">true</ProjectStartsWithStandardName>
9-
<ImportRepoCommonSettings Condition="'$(ImportRepoCommonSettings)' == '' and '$(ProjectStartsWithStandardName)' == 'true' and '$(IsLegacyMgmtProject)' != 'true'">true</ImportRepoCommonSettings>
7+
<IsClientLibrary Condition="'$(IsClientLibrary)' == '' and $(MSBuildProjectName.StartsWith('Azure.'))">true</IsClientLibrary>
8+
<IsDataPlaneProject Condition="'$(IsDataPlaneProject)' == '' and '$(IsClientLibrary)' == 'true'">true</IsDataPlaneProject>
109
</PropertyGroup>
1110

1211
<!-- Setup default project properties -->
@@ -34,11 +33,8 @@
3433
<IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>
3534

3635
<PackageOutputPath>$(ArtifactsPackagesDir)/$(MSBuildProjectName)</PackageOutputPath>
37-
38-
<!-- Used to help catch projects that use this property but don't end up importing our props below -->
39-
<RequiredTargetFrameworks>import-required-properties</RequiredTargetFrameworks>
4036
</PropertyGroup>
4137

42-
<Import Project="$(RepoEngPath)\mgmt\Directory.Build.Mgmt.props" Condition="'$(IsLegacyMgmtProject)' == 'true'" />
43-
<Import Project="$(RepoEngPath)\Directory.Build.Common.props" Condition="'$(ImportRepoCommonSettings)' == 'true'" />
38+
<Import Project="$(RepoEngPath)\mgmt\Directory.Build.Mgmt.props" Condition="'$(IsDataPlaneProject)' != 'true'" />
39+
<Import Project="$(RepoEngPath)\Directory.Build.Data.props" Condition="'$(IsDataPlaneProject)' == 'true'" />
4440
</Project>

Directory.Build.targets

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<ItemGroup Condition="'$(IsTestProject)' == 'true' or '$(IsPerfProject)' == 'true' or '$(IsStressProject)' == 'true'">
3-
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
4-
<_Parameter1>SourcePath</_Parameter1>
5-
<_Parameter2>$(MSBuildProjectDirectory)</_Parameter2>
6-
</AssemblyAttribute>
7-
</ItemGroup>
8-
9-
<Import Project="$(RepoEngPath)\mgmt\Directory.Build.Mgmt.targets" Condition="'$(IsLegacyMgmtProject)' == 'true'" />
10-
<Import Project="$(RepoEngPath)\Directory.Build.Common.targets" Condition="'$(ImportRepoCommonSettings)' == 'true'" />
11-
</Project>
2+
<Import Project="$(RepoEngPath)\mgmt\Directory.Build.Mgmt.targets" Condition="'$(IsDataPlaneProject)' != 'true'" />
3+
<Import Project="$(RepoEngPath)\Directory.Build.Data.targets" Condition="'$(IsDataPlaneProject)' == 'true'" />
4+
</Project>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Last stable versions of packages that are production-ready. These libraries prov
3535

3636
A new set of management libraries that follow the [Azure SDK Design Guidelines for .NET](https://azure.github.io/azure-sdk/dotnet_introduction.html) and based on [Azure.Core libraries](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/core/Azure.Core) are now in Public Preview. These new libraries provide a number of core capabilities that are shared amongst all Azure SDKs, including the intuitive Azure Identity library, an HTTP Pipeline with custom policies, error-handling, distributed tracing, and much more. You can find the list of new packages [on this page](https://azure.github.io/azure-sdk/releases/latest/dotnet.html).
3737

38-
To get started with these new libraries, please see the [quickstart guide here](https://github.com/Azure/azure-sdk-for-net/blob/master/doc/mgmt_preview_quickstart.md). These new libraries can be identified by namespaces that start with `Azure.ResourceManager`, e.g. `Azure.ResourceManager.Network`
38+
To get started with these new libraries, please see the [quickstart guide here](https://github.com/Azure/azure-sdk-for-net/blob/master/doc/mgmt_preview_quickstart.md). These new libraries can be identifed by namespaces that start with `Azure.ResourceManager`, e.g. `Azure.ResourceManager.Network`
3939

4040
> NOTE: If you need to ensure your code is ready for production use one of the stable, non-preview libraries.
4141

SUPPORT.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

build.proj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<Project Sdk="Microsoft.Build.Traversal">
2-
<Import Project="eng\mgmt\Directory.Build.Mgmt.props" />
3-
42
<ItemGroup>
53
<ProjectReference Include="eng\mgmt.proj">
64
<AdditionalProperties Condition="'$(Scope)' != ''">Scope=$(Scope)</AdditionalProperties>

0 commit comments

Comments
 (0)