Skip to content

Commit 6d1a683

Browse files
authored
Merge pull request #7999 from MiYanni/az-cleanup-8-build
8: Update build.proj process for Az
2 parents 004c54a + 94e9292 commit 6d1a683

File tree

72 files changed

+158
-4627
lines changed

Some content is hidden

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

72 files changed

+158
-4627
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 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
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 & 1085 deletions
This file was deleted.

AzurePowershell.Test.targets

Lines changed: 0 additions & 465 deletions
This file was deleted.
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>

build.proj

Lines changed: 116 additions & 236 deletions
Large diffs are not rendered by default.

packages.config

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

src/Azure.PowerShell.Netcore.Test.sln

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

src/AzureRT.testsettings

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

src/AzureRTSeq.testsettings

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

src/Local.testsettings

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

src/Local.x64.testsettings

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

0 commit comments

Comments
 (0)