Skip to content

Commit f89640d

Browse files
vivermviverm
committed
Merge
2 parents 707af15 + f6a2882 commit f89640d

File tree

3,664 files changed

+544951
-4214900
lines changed

Some content is hidden

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

3,664 files changed

+544951
-4214900
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ If this issue is not a bug report, please remove the below template
2828

2929
### Module Version
3030

31-
<!-- Please run (Get-Module -Name AzureRM -ListAvailable) to get the version(s) of AzureRM installed on your machine -->
31+
<!-- Please run (Get-Module -ListAvailable) to get the version(s) of all modules, including Azure installed on your machine -->
3232

3333
```powershell
34-
Get-Module -Name AzureRM -ListAvailable
34+
Get-Module -ListAvailable
3535
```
3636

3737
### Environment Data
@@ -44,7 +44,7 @@ $PSVersionTable
4444

4545
### Debug Output
4646

47-
<!-- Please run the above script with $DebugPreference = "Continue" and paste the resulting debug stream in the below code block -->
47+
<!-- Please run the above script with $DebugPreference='Continue' and paste the resulting debug stream in the below code block -->
4848

4949
```
5050

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sudo: required
22
language: csharp
33
mono: none
4-
dotnet: 2.1.302
4+
dotnet: 2.1.400
55
dist: trusty
66

77
env:
@@ -19,16 +19,16 @@ before_install:
1919
- sudo dpkg -i packages-microsoft-prod.deb
2020
- sudo apt-get install apt-transport-https
2121
- sudo apt-get update
22-
- sudo apt-get install dotnet-sdk-2.1
2322
- sudo apt-get install -y powershell
2423
- sudo pwsh -NonInteractive -NoLogo -NoProfile -Command "Install-Module platyPS -Force -Confirm:\$false -Scope CurrentUser"
2524

2625
# https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
2726
script:
2827
- sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
28+
- sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u
2929
- sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
3030
- sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG
31-
31+
3232
after_success:
3333
- if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
3434
docker build . -t $DOCKER_USER/$NAME:$TRAVIS_COMMIT --build-arg CONFIG=$CONFIG;
@@ -39,7 +39,7 @@ after_success:
3939
docker push $DOCKER_USER/$NAME:$TRAVIS_COMMIT;
4040
docker push $DOCKER_USER/$NAME:$TRAVIS_BRANCH;
4141

42-
if [ "$TRAVIS_BRANCH" == "master" ]; then
42+
if [ "$TRAVIS_BRANCH" == "master" ]; then
4343
docker tag $DOCKER_USER/$NAME:$TRAVIS_COMMIT $DOCKER_USER/$NAME:latest;
4444
docker push $DOCKER_USER/$NAME:latest;
4545
fi;

‎Azure.PowerShell.Netcore.sln

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.27130.2027
@@ -134,6 +134,11 @@ EndProject
134134
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RecoveryServices.Backup.Logger.Netcore", "src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Backup.Logger\Commands.RecoveryServices.Backup.Logger.Netcore.csproj", "{9187418A-30A4-4320-8919-69799D99F2C2}"
135135
EndProject
136136
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RecoveryServices.Backup.Models.Netcore", "src\ResourceManager\RecoveryServices\Commands.RecoveryServices.Backup.Models\Commands.RecoveryServices.Backup.Models.Netcore.csproj", "{3DC73068-DB61-4B56-AC0E-5CAA40A5C170}"
137+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Common.Netcore", "tools\Tools.Common\Tools.Common.Netcore.csproj", "{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}"
138+
EndProject
139+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticAnalysis.Netcore", "tools\StaticAnalysis\StaticAnalysis.Netcore.csproj", "{493FA948-DA9C-47CD-8385-3C0261377D86}"
140+
EndProject
141+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RedisCache.Netcore", "src\ResourceManager\RedisCache\Commands.RedisCache\Commands.RedisCache.Netcore.csproj", "{06B4370D-D375-482C-AD23-CFDAC0176147}"
137142
EndProject
138143
Global
139144
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -937,6 +942,42 @@ Global
937942
{3DC73068-DB61-4B56-AC0E-5CAA40A5C170}.Release|x64.Build.0 = Release|Any CPU
938943
{3DC73068-DB61-4B56-AC0E-5CAA40A5C170}.Release|x86.ActiveCfg = Release|Any CPU
939944
{3DC73068-DB61-4B56-AC0E-5CAA40A5C170}.Release|x86.Build.0 = Release|Any CPU
945+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
946+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
947+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Debug|x64.ActiveCfg = Debug|Any CPU
948+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Debug|x64.Build.0 = Debug|Any CPU
949+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Debug|x86.ActiveCfg = Debug|Any CPU
950+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Debug|x86.Build.0 = Debug|Any CPU
951+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
952+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Release|Any CPU.Build.0 = Release|Any CPU
953+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Release|x64.ActiveCfg = Release|Any CPU
954+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Release|x64.Build.0 = Release|Any CPU
955+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Release|x86.ActiveCfg = Release|Any CPU
956+
{EE2A4BB9-2ECB-4CAE-AD82-C4882B6ECDE0}.Release|x86.Build.0 = Release|Any CPU
957+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
958+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
959+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Debug|x64.ActiveCfg = Debug|Any CPU
960+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Debug|x64.Build.0 = Debug|Any CPU
961+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Debug|x86.ActiveCfg = Debug|Any CPU
962+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Debug|x86.Build.0 = Debug|Any CPU
963+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
964+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|Any CPU.Build.0 = Release|Any CPU
965+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|x64.ActiveCfg = Release|Any CPU
966+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|x64.Build.0 = Release|Any CPU
967+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|x86.ActiveCfg = Release|Any CPU
968+
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|x86.Build.0 = Release|Any CPU
969+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
970+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|Any CPU.Build.0 = Debug|Any CPU
971+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x64.ActiveCfg = Debug|Any CPU
972+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x64.Build.0 = Debug|Any CPU
973+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x86.ActiveCfg = Debug|Any CPU
974+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x86.Build.0 = Debug|Any CPU
975+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|Any CPU.ActiveCfg = Release|Any CPU
976+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|Any CPU.Build.0 = Release|Any CPU
977+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x64.ActiveCfg = Release|Any CPU
978+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x64.Build.0 = Release|Any CPU
979+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x86.ActiveCfg = Release|Any CPU
980+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x86.Build.0 = Release|Any
940981
EndGlobalSection
941982
GlobalSection(SolutionProperties) = preSolution
942983
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)