Skip to content

Commit e8de5f4

Browse files
committed
Removed legacy Netcore test project build/sln. Removed legacy .testsettings files. Removed local-artifacts as it was only involved in the (now removed) net472 build process. Updated travis.yml to only run the build.proj. Arranged package discovery in NuGet.Config to be the most logical (from local, to our myget, to specific PowerShell feeds, to NuGet). Updated build.proj to handle TestResults folders appropriately.
1 parent aea4827 commit e8de5f4

13 files changed

+6
-2543
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ before_install:
2626
script:
2727
- sudo dotnet msbuild build.proj /t:Full /p:Configuration=$CONFIG || travis_terminate 1
2828
# - 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
29+
# - 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 --framework netcoreapp2.0
3131

3232
after_success:

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
<!-- Clean out the NuGet cache -->
136136
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;$Path = Join-Path $env:USERPROFILE .nuget; if (Test-Path $Path) { Remove-Item $Path -Recurse -Force }&quot;" />
137137

138-
<!-- Remove Package, Publish, bin, and obj directories -->
138+
<!-- Remove Package, Publish, bin, obj, and TestResults directories -->
139139
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Remove-Item -Path $(PackageDirectory),$(PublishDirectory) -Recurse -Force&quot;" />
140-
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(MSBuildThisFileDirectory) -Recurse -Include 'bin','obj' | Remove-Item -Recurse -Force&quot;" />
140+
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Get-ChildItem -Path $(MSBuildThisFileDirectory) -Recurse -Include 'bin','obj','TestResults' | Remove-Item -Recurse -Force&quot;" />
141141
</Target>
142142

143143
<PropertyGroup>
@@ -508,7 +508,7 @@
508508
<ItemGroup>
509509
<TestResults Include="$(LibraryRoot)src/ResourceManager/**/TestResults/*.trx" />
510510
</ItemGroup>
511-
<Move SourceFiles="@(TestResults)" DestinationFolder="$(TestOutputDirectory)" />
511+
<Copy SourceFiles="@(TestResults)" DestinationFolder="$(TestOutputDirectory)" />
512512

513513
<OnError ExecuteTargets="TestFailureErrorMessage" />
514514
</Target>

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/Directory.Build.targets

Lines changed: 0 additions & 6 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)