Skip to content

Commit

Permalink
Removed legacy Netcore test project build/sln. Removed legacy .testse…
Browse files Browse the repository at this point in the history
…ttings 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.
  • Loading branch information
MiYanni committed Dec 4, 2018
1 parent 1e87451 commit 6c69e76
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 2,543 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ before_install:
script:
- sudo dotnet msbuild build.proj /t:Full /p:Configuration=$CONFIG || travis_terminate 1
# - 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
- sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
# - sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
# - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG --framework netcoreapp2.0

after_success:
Expand Down
5 changes: 2 additions & 3 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="local-artifacts" value="src/local-artifacts" />
<add key="local-feed" value="tools/LocalFeed" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="myget-azure-powershell" value="https://www.myget.org/F/azure-powershell/api/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
<add key="myget-azure-powershell" value="https://www.myget.org/F/azure-powershell/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
6 changes: 3 additions & 3 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
<!-- Clean out the NuGet cache -->
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;$Path = Join-Path $env:USERPROFILE .nuget; if (Test-Path $Path) { Remove-Item $Path -Recurse -Force }&quot;" />

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

<PropertyGroup>
Expand Down Expand Up @@ -508,7 +508,7 @@
<ItemGroup>
<TestResults Include="$(LibraryRoot)src/ResourceManager/**/TestResults/*.trx" />
</ItemGroup>
<Move SourceFiles="@(TestResults)" DestinationFolder="$(TestOutputDirectory)" />
<Copy SourceFiles="@(TestResults)" DestinationFolder="$(TestOutputDirectory)" />

<OnError ExecuteTargets="TestFailureErrorMessage" />
</Target>
Expand Down
5 changes: 0 additions & 5 deletions packages.config

This file was deleted.

723 changes: 0 additions & 723 deletions src/Azure.PowerShell.Netcore.Test.sln

This file was deleted.

15 changes: 0 additions & 15 deletions src/AzureRT.testsettings

This file was deleted.

15 changes: 0 additions & 15 deletions src/AzureRTSeq.testsettings

This file was deleted.

6 changes: 0 additions & 6 deletions src/Directory.Build.targets

This file was deleted.

36 changes: 0 additions & 36 deletions src/Local.testsettings

This file was deleted.

41 changes: 0 additions & 41 deletions src/Local.x64.testsettings

This file was deleted.

Loading

0 comments on commit 6c69e76

Please sign in to comment.