Skip to content

Commit e250ae4

Browse files
authored
Merge pull request #8097 from markcowl/common-200-master
Merge az-cleanup into master
2 parents a0fa6ac + c533f7d commit e250ae4

File tree

10,884 files changed

+9172
-4020149
lines changed

Some content is hidden

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

10,884 files changed

+9172
-4020149
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,3 +242,4 @@ launchSettings.json
242242
/TestMappings.json
243243
/tools/Modules/tmp
244244
/tools/Az/Az.psm1
245+
/Azure.PowerShell.sln

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ before_install:
2424

2525
# https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
2626
script:
27-
- sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
28-
- sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
29-
- sudo dotnet pack src/TestPrerequisites/Common.TestPrerequisites.sln --configuration $CONFIG || travis_terminate 1
30-
- sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0
27+
- sudo dotnet msbuild build.proj /t:Full /p:Configuration=$CONFIG || travis_terminate 1
28+
# - sudo dotnet src/Package/StaticAnalysis/StaticAnalysis.Netcore.dll -p $TRAVIS_BUILD_DIR/src/Package/$CONFIG -r $TRAVIS_BUILD_DIR/src/Package/StaticAnalysis -u || travis_terminate 1
29+
# - sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
30+
# - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0
3131

3232
after_success:
3333
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

Azure.PowerShell.Netcore.sln

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

AzurePowershell.Test.targets

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

CONTRIBUTING.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Contribute Code or Provide Feedback for Azure PowerShell
22

3-
This repository contains a set of PowerShell cmdlets for developers and administrators to develop, deploy, and manage Microsoft Azure applications.
3+
This repository contains PowerShell cmdlets for developers and administrators to develop, deploy, and manage Microsoft Azure applications.
44

55
## Basics
66

7-
If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).
7+
If you would like to become an active contributor to this project, please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).
88

99
In the Azure Developer Experience, you are at Step 5:
1010

@@ -90,7 +90,7 @@ For more information on how to make changes to the SDK for .NET repository and p
9090

9191
A pull request template will automatically be included as a part of your PR. Please fill out the checklist as specified. Pull requests **will not be reviewed** unless they include a properly completed checklist.
9292

93-
The following is a list of guidelines that pull requests opened in the Azure PowerShell repository must adhere to. You can find a more complete discussion of Azure PowerShell design guidelines [here](./documentation/development-docs/azure-powershell-design-guidelines.md).
93+
The following is a list of guidelines that pull requests opened in the Azure PowerShell repository must adhere to. You can find a more complete discussion of Azure PowerShell design guidelines [here](documentation/development-docs/azure-powershell-design-guidelines.md).
9494

9595
#### Cleaning up Commits
9696

@@ -102,15 +102,13 @@ If you find yourself creating a pull request and are unable to see all the chang
102102

103103
If splitting up the pull request is not an option, we recommend **creating individual commits for different parts of the pull request, which can be reviewed individually on GitHub**.
104104

105-
For more information on cleaning up the commits in a pull request, such as how to rebase, squash, and cherry-pick, click [here](./documentation/development-docs/cleaning-up-commits.md).
105+
For more information on cleaning up the commits in a pull request, such as how to rebase, squash, and cherry-pick, click [here](documentation/development-docs/cleaning-up-commits.md).
106106

107107
#### Updating the change log
108108

109109
Any changes that are made must be reflected in the respecitve service's change log. This change log will allow customers to easily track what has been changed between releases of a service.
110110

111-
For ARM service projects, the change log is located at `src\ResourceManager\{{service}}\ChangeLog.md`.
112-
113-
For RDFE service projects, the change log is located at `src\ServiceManagement\ChangeLog.md`.
111+
For ARM service projects, the change log is located at `src/ResourceManager/{{service}}/Commands.{{service}}/ChangeLog.md`.
114112

115113
#### Breaking Changes
116114

@@ -127,7 +125,7 @@ The following guidelines must be followed in **EVERY** pull request that is open
127125
- A description of the changes the pull request makes is included, and a reference to the bug/issue the pull request fixes is included, if applicable
128126
- All files have the Microsoft copyright header
129127
- Cmdlets refer to the management libraries through NuGet references - no dlls are checked in
130-
- The pull request does not introduce [breaking changes](https://github.com/Azure/azure-powershell/blob/master/documentation/breaking-changes/breaking-changes-definition.md) (unless a major version change occurs in the assembly and module)
128+
- The pull request does not introduce [breaking changes](documentation/breaking-changes/breaking-changes-definition.md) (unless a major version change occurs in the assembly and module)
131129

132130
#### Testing guidelines
133131

@@ -139,7 +137,7 @@ The following guidelines must be followed in **EVERY** pull request that is open
139137
- PowerShell scripts used in tests must do any necessary setup as part of the test or suite setup, and should not use hard-coded values for existing resources
140138
- Test should not use App.config files for settings
141139
- Tests should use the built-in PowerShell functions for generating random names when unique names are necessary - this will store names in the test recording
142-
- Tests should use `Start-Sleep` to pause rather than `Thread.Sleep`
140+
- Tests should use `Wait-Seconds` for PowerShell and `TestUtilities.Wait` for C# to pause rather than `Start-Sleep` or `Thread.Sleep` respectively
143141

144142
#### Cmdlet signature guidelines
145143

@@ -150,7 +148,7 @@ The following guidelines must be followed in pull requests that add, edit, or re
150148
- When a verb you would like to use is not in the list of approved verbs, or to get ideas on how to use verbs, consult the [Approved Verbs for Windows PowerShell Commands](https://msdn.microsoft.com/en-us/library/ms714428\(v=vs.85\).aspx) documentation where you will find descriptions of approved verbs as well as related verbs in the comments so that you can find one appropriate for your command
151149
- Cmdlet noun name uses the AzureRm prefix for management cmdlets, and the Azure prefix for data plane cmdlets
152150
- Cmdlet specifies the `OutputType` attribute; if the cmdlet produces no output, it should have an `OutputType` of `bool` and implement a `PassThrough` parameter
153-
- If the cmdlet makes changes or has side effects, it should implement `ShouldProcess` and have `SupportsShouldProcess = true` specified in the cmdlet attribute. See a discussion about correct `ShouldProcess` implementation [here](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/should-process-confirm-impact.md).
151+
- If the cmdlet makes changes or has side effects, it should implement `ShouldProcess` and have `SupportsShouldProcess = true` specified in the cmdlet attribute. See a discussion about correct `ShouldProcess` implementation [here](documentation/development-docs/should-process-confirm-impact.md).
154152
- Cmdlets should derive from [`AzureRmCmdlet`](https://github.com/Azure/azure-powershell-common/blob/master/src/ResourceManager/Version2016_09_01/AzureRMCmdlet.cs) class for management cmdlets, and [`AzureDataCmdlet`](https://github.com/Azure/azure-powershell-common/blob/master/src/Common/AzureDataCmdlet.cs) for data cmdlets
155153
- If multiple parameter sets are implemented, the cmdlet should specify a `DefaultParameterSetName` in its cmdlet attribute
156154

File renamed without changes.

NuGet.Config

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="local-artifacts" value="src/local-artifacts" />
54
<add key="local-feed" value="tools/LocalFeed" />
6-
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
5+
<add key="myget-azure-powershell" value="https://www.myget.org/F/azure-powershell/api/v3/index.json" />
76
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
87
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
9-
<add key="myget-azure-powershell" value="https://www.myget.org/F/azure-powershell/api/v3/index.json" />
8+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
109
</packageSources>
1110
</configuration>

0 commit comments

Comments
 (0)