Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(MSBuildThisFileDirectory)..\LibZipSharp.props" />
<PropertyGroup>
<TargetFrameworks>net471</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows')) And $([MSBuild]::IsOsPlatform('Linux'))">$(TargetFrameworks);netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.1</TargetFrameworks>

<IsPackable>false</IsPackable>
<LibZipSharpBundleAllNativeLibraries>true</LibZipSharpBundleAllNativeLibraries>
<ReferenceNuget Condition="'$(ReferenceNuget)' == ''">False</ReferenceNuget>
<DefineConstants Condition="'$(OS)' == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\LibZipSharp.props" />

<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
Expand Down
36 changes: 29 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ stages:
- buildlinux
- buildWindows
pool:
vmImage: macOS-10.14
vmImage: macOS-latest
steps:
- bash: |
brew tap xamarin/xamarin-android-windeps
Expand Down Expand Up @@ -194,6 +194,12 @@ stages:
inputs:
artifactName: NuGet
downloadPath: $(Build.SourcesDirectory)
- task: MSBuild@1
displayName: 'Build solution LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
inputs:
solution: LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
configuration: Release
msbuildArguments: /restore /p:ReferenceNuget=True /v:diag
- task: MSBuild@1
displayName: 'Build solution LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
inputs:
Expand All @@ -204,12 +210,11 @@ stages:
displayName: "Run Tests under .net Core"
inputs:
command: test
projects: 'LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
arguments: '--configuration Release --framework netcoreapp3.1 --no-build'
arguments: 'LibZipSharp.UnitTest/bin/Release/netcoreapp3.1/LibZipSharp.UnitTest.dll'
- job: testmacos
displayName: 'Test MacOS'
pool:
vmImage: macOS-10.14
vmImage: macOS-latest
steps:
- template: yaml-templates/use-dot-net.yaml
parameters:
Expand All @@ -219,16 +224,27 @@ stages:
inputs:
artifactName: NuGet
downloadPath: $(Build.SourcesDirectory)
- task: MSBuild@1
displayName: 'Build solution LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
inputs:
solution: LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
configuration: Release
msbuildArguments: /restore /p:ReferenceNuget=True /v:diag
- task: MSBuild@1
displayName: 'Build solution LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
inputs:
solution: LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
configuration: Release
msbuildArguments: /restore /t:RunNunitTests /p:ReferenceNuget=True /v:diag
- task: DotNetCoreCLI@2
displayName: "Run Tests under .net Core"
inputs:
command: test
arguments: 'LibZipSharp.UnitTest/bin/Release/netcoreapp3.1/LibZipSharp.UnitTest.dll'
- job: testwindows
displayName: 'Test Windows'
pool:
vmImage: windows-2019
vmImage: windows-latest
steps:
- template: yaml-templates/use-dot-net.yaml
parameters:
Expand All @@ -240,6 +256,12 @@ stages:
downloadPath: $(Build.SourcesDirectory)
- task: MSBuild@1
displayName: 'Build solution LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
inputs:
solution: LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
configuration: Release
msbuildArguments: /restore /p:ReferenceNuget=True /v:diag
- task: MSBuild@1
displayName: 'Run Tests LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
inputs:
solution: LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj
configuration: Release
Expand All @@ -248,8 +270,8 @@ stages:
displayName: "Run Tests under .net Core"
inputs:
command: test
projects: 'LibZipSharp.UnitTest/LibZipSharp.UnitTest.csproj'
arguments: '--configuration Release --framework netcoreapp3.1 --no-build'
arguments: 'LibZipSharp.UnitTest\bin\Release\netcoreapp3.1\LibZipSharp.UnitTest.dll
'
- stage: Publish
dependsOn: Test
condition: eq(variables['System.TeamProject'], 'devdiv') # only sign the packages when running on Windows, and using the private server which has the certificates
Expand Down