Skip to content
This repository has been archived by the owner on Jan 8, 2023. It is now read-only.

Commit

Permalink
Merge pull request #29 from halex2005/master
Browse files Browse the repository at this point in the history
update dependencies versions
  • Loading branch information
halex2005 authored Oct 25, 2019
2 parents add82bf + 66470ce commit f652ffa
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 107 deletions.
5 changes: 3 additions & 2 deletions Content/dotnet-new-nunit-csharp/Company.TestProject1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@

<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(TargetFrameworkOverride)' &lt; 'netcoreapp2.0'"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" Condition="'$(TargetFrameworkOverride)' &gt;= 'netcoreapp2.0'"/>
</ItemGroup>

</Project>
5 changes: 3 additions & 2 deletions Content/dotnet-new-nunit-fsharp/Company.TestProject1.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@

<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(TargetFrameworkOverride)' &lt; 'netcoreapp2.0'"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" Condition="'$(TargetFrameworkOverride)' &gt;= 'netcoreapp2.0'"/>
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@

<ItemGroup>
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" Condition="'$(TargetFrameworkOverride)' &lt; 'netcoreapp2.0'"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" Condition="'$(TargetFrameworkOverride)' &gt;= 'netcoreapp2.0'"/>
</ItemGroup>

</Project>
218 changes: 119 additions & 99 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,141 +1,161 @@
image: Visual Studio 2019 Preview
image:
- Visual Studio 2017
- Visual Studio 2019 Preview
version: 1.0.{build}
platform:
- Any CPU
configuration:
- Release
build_script:
# todo: nuget pack and install templates from nuget package
- nuget pack nunit-template.nuspec
- dotnet new -i ./Content

- dotnet new nunit -n CSharpNetCore1 --framework netcoreapp1.0 -lang c#
- dotnet new nunit -n FSharpNetCore1 --framework netcoreapp1.0 -lang f#
- dotnet new nunit -n VBasicNetCore1 --framework netcoreapp1.0 -lang vb
for:
-
matrix:
only:
- image: Visual Studio 2017

- dotnet new nunit -n CSharpNetCore11 --framework netcoreapp1.1 -lang c#
- dotnet new nunit -n FSharpNetCore11 --framework netcoreapp1.1 -lang f#
- dotnet new nunit -n VBasicNetCore11 --framework netcoreapp1.1 -lang vb
build_script:
- nuget pack nunit-template.nuspec
- dotnet new -i ./Content
- dotnet --info

- dotnet new nunit -n CSharpNetCore2 --framework netcoreapp2.0 -lang c#
- dotnet new nunit -n FSharpNetCore2 --framework netcoreapp2.0 -lang f#
- dotnet new nunit -n VBasicNetCore2 --framework netcoreapp2.0 -lang vb
- dotnet new nunit -n CSharpNetCore1 --framework netcoreapp1.0 -lang c#
- dotnet new nunit -n FSharpNetCore1 --framework netcoreapp1.0 -lang f#
- dotnet new nunit -n VBasicNetCore1 --framework netcoreapp1.0 -lang vb

- dotnet new nunit -n CSharpNetCore21 --framework netcoreapp2.1 -lang c#
- dotnet new nunit -n FSharpNetCore21 --framework netcoreapp2.1 -lang f#
- dotnet new nunit -n VBasicNetCore21 --framework netcoreapp2.1 -lang vb
- dotnet new nunit -n CSharpNetCore11 --framework netcoreapp1.1 -lang c#
- dotnet new nunit -n FSharpNetCore11 --framework netcoreapp1.1 -lang f#
- dotnet new nunit -n VBasicNetCore11 --framework netcoreapp1.1 -lang vb

- dotnet new nunit -n CSharpNetCore22 --framework netcoreapp2.2 -lang c#
- dotnet new nunit -n FSharpNetCore22 --framework netcoreapp2.2 -lang f#
- dotnet new nunit -n VBasicNetCore22 --framework netcoreapp2.2 -lang vb
test_script:
- dotnet test CSharpNetCore1
- dotnet test FSharpNetCore1
- dotnet test VBasicNetCore1

- dotnet new nunit -n CSharpNetCore30 --framework netcoreapp3.0 -lang c#
- dotnet new nunit -n FSharpNetCore30 --framework netcoreapp3.0 -lang f#
- dotnet new nunit -n VBasicNetCore30 --framework netcoreapp3.0 -lang vb
- dotnet test CSharpNetCore11
- dotnet test FSharpNetCore11
- dotnet test VBasicNetCore11

- dotnet new nunit-test -n NewTestFixture -o CSharpNetCore21 -lang c#
- dotnet new nunit-test -n NewTestFixture -o FSharpNetCore21 -lang f#
- dotnet new nunit-test -n NewTestFixture -o VBasicNetCore21 -lang vb
artifacts:
- path: '*.nupkg'

# unfortunately, F# under full .NET Framework issues a compilation error, the issue is in F# compiler
- dotnet new nunit -n CSharpNet35 --framework net35 -lang c#
- dotnet new nunit -n VBasicNet35 --framework net35 -lang vb
-
matrix:
only:
- image: Visual Studio 2019 Preview

- dotnet new nunit -n CSharpNet40 --framework net40 -lang c#
- dotnet new nunit -n VBasicNet40 --framework net40 -lang vb
build_script:
- nuget pack nunit-template.nuspec
- dotnet new -i ./Content
- dotnet --info

- dotnet new nunit -n CSharpNet45 --framework net45 -lang c#
- dotnet new nunit -n VBasicNet45 --framework net45 -lang vb
- dotnet new nunit -n CSharpNetCore2 --framework netcoreapp2.0 -lang c#
- dotnet new nunit -n FSharpNetCore2 --framework netcoreapp2.0 -lang f#
- dotnet new nunit -n VBasicNetCore2 --framework netcoreapp2.0 -lang vb

- dotnet new nunit -n CSharpNet451 --framework net451 -lang c#
- dotnet new nunit -n VBasicNet451 --framework net451 -lang vb
- dotnet new nunit -n CSharpNetCore21 --framework netcoreapp2.1 -lang c#
- dotnet new nunit -n FSharpNetCore21 --framework netcoreapp2.1 -lang f#
- dotnet new nunit -n VBasicNetCore21 --framework netcoreapp2.1 -lang vb

- dotnet new nunit -n CSharpNet452 --framework net452 -lang c#
- dotnet new nunit -n VBasicNet452 --framework net452 -lang vb
- dotnet new nunit -n CSharpNetCore22 --framework netcoreapp2.2 -lang c#
- dotnet new nunit -n FSharpNetCore22 --framework netcoreapp2.2 -lang f#
- dotnet new nunit -n VBasicNetCore22 --framework netcoreapp2.2 -lang vb

- dotnet new nunit -n CSharpNet46 --framework net46 -lang c#
- dotnet new nunit -n VBasicNet46 --framework net46 -lang vb
- dotnet new nunit -n CSharpNetCore30 --framework netcoreapp3.0 -lang c#
- dotnet new nunit -n FSharpNetCore30 --framework netcoreapp3.0 -lang f#
- dotnet new nunit -n VBasicNetCore30 --framework netcoreapp3.0 -lang vb

- dotnet new nunit -n CSharpNet461 --framework net461 -lang c#
- dotnet new nunit -n VBasicNet461 --framework net461 -lang vb
- dotnet new nunit-test -n NewTestFixture -o CSharpNetCore21 -lang c#
- dotnet new nunit-test -n NewTestFixture -o FSharpNetCore21 -lang f#
- dotnet new nunit-test -n NewTestFixture -o VBasicNetCore21 -lang vb

- dotnet new nunit -n CSharpNet462 --framework net462 -lang c#
- dotnet new nunit -n VBasicNet462 --framework net462 -lang vb
# unfortunately, F# under full .NET Framework issues a compilation error, the issue is in F# compiler
- dotnet new nunit -n CSharpNet35 --framework net35 -lang c#
- dotnet new nunit -n VBasicNet35 --framework net35 -lang vb

- dotnet new nunit -n CSharpNet47 --framework net47 -lang c#
- dotnet new nunit -n VBasicNet47 --framework net47 -lang vb
- dotnet new nunit -n CSharpNet40 --framework net40 -lang c#
- dotnet new nunit -n VBasicNet40 --framework net40 -lang vb

- dotnet new nunit -n CSharpNet471 --framework net471 -lang c#
- dotnet new nunit -n VBasicNet471 --framework net471 -lang vb
- dotnet new nunit -n CSharpNet45 --framework net45 -lang c#
- dotnet new nunit -n VBasicNet45 --framework net45 -lang vb

- dotnet new nunit -n CSharpNet472 --framework net472 -lang c#
- dotnet new nunit -n VBasicNet472 --framework net472 -lang vb
- dotnet new nunit -n CSharpNet451 --framework net451 -lang c#
- dotnet new nunit -n VBasicNet451 --framework net451 -lang vb

- dotnet new nunit -n CSharpNet48 --framework net48 -lang c#
- dotnet new nunit -n VBasicNet48 --framework net48 -lang vb
test_script:
- dotnet test CSharpNetCore1
- dotnet test FSharpNetCore1
- dotnet test VBasicNetCore1
- dotnet new nunit -n CSharpNet452 --framework net452 -lang c#
- dotnet new nunit -n VBasicNet452 --framework net452 -lang vb

- dotnet test CSharpNetCore11
- dotnet test FSharpNetCore11
- dotnet test VBasicNetCore11
- dotnet new nunit -n CSharpNet46 --framework net46 -lang c#
- dotnet new nunit -n VBasicNet46 --framework net46 -lang vb

- dotnet test CSharpNetCore2
- dotnet test FSharpNetCore2
- dotnet test VBasicNetCore2
- dotnet new nunit -n CSharpNet461 --framework net461 -lang c#
- dotnet new nunit -n VBasicNet461 --framework net461 -lang vb

- dotnet test CSharpNetCore21
- dotnet test FSharpNetCore21
- dotnet test VBasicNetCore21
- dotnet new nunit -n CSharpNet462 --framework net462 -lang c#
- dotnet new nunit -n VBasicNet462 --framework net462 -lang vb

- dotnet test CSharpNetCore22
- dotnet test FSharpNetCore22
- dotnet test VBasicNetCore22
- dotnet new nunit -n CSharpNet47 --framework net47 -lang c#
- dotnet new nunit -n VBasicNet47 --framework net47 -lang vb

- dotnet test CSharpNetCore30
- dotnet test FSharpNetCore30
- dotnet test VBasicNetCore30
- dotnet new nunit -n CSharpNet471 --framework net471 -lang c#
- dotnet new nunit -n VBasicNet471 --framework net471 -lang vb

- msbuild /p:FrameworkPathOverride="%programfiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client" CSharpNet35
- msbuild /p:FrameworkPathOverride="%programfiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client" VBasicNet35
- dotnet test CSharpNet35 --no-build
- dotnet test VBasicNet35 --no-build
- dotnet new nunit -n CSharpNet472 --framework net472 -lang c#
- dotnet new nunit -n VBasicNet472 --framework net472 -lang vb

- dotnet test CSharpNet40
- dotnet test VBasicNet40
- dotnet new nunit -n CSharpNet48 --framework net48 -lang c#
- dotnet new nunit -n VBasicNet48 --framework net48 -lang vb

- dotnet test CSharpNet45
- dotnet test VBasicNet45
test_script:
- dotnet test CSharpNetCore2
- dotnet test FSharpNetCore2
- dotnet test VBasicNetCore2

- dotnet test CSharpNet451
- dotnet test VBasicNet451
- dotnet test CSharpNetCore21
- dotnet test FSharpNetCore21
- dotnet test VBasicNetCore21

- dotnet test CSharpNet452
- dotnet test VBasicNet452
- dotnet test CSharpNetCore22
- dotnet test FSharpNetCore22
- dotnet test VBasicNetCore22

- dotnet test CSharpNet46
- dotnet test VBasicNet46
- dotnet test CSharpNetCore30
- dotnet test FSharpNetCore30
- dotnet test VBasicNetCore30

- dotnet test CSharpNet461
- dotnet test VBasicNet461
- msbuild /p:FrameworkPathOverride="%programfiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client" CSharpNet35
- msbuild /p:FrameworkPathOverride="%programfiles(x86)%\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client" VBasicNet35
- dotnet test CSharpNet35 --no-build
- dotnet test VBasicNet35 --no-build

- dotnet test CSharpNet462
- dotnet test VBasicNet462
- dotnet test CSharpNet40
- dotnet test VBasicNet40

- dotnet test CSharpNet47
- dotnet test VBasicNet47
- dotnet test CSharpNet45
- dotnet test VBasicNet45

- dotnet test CSharpNet471
- dotnet test VBasicNet471
- dotnet test CSharpNet451
- dotnet test VBasicNet451

- dotnet test CSharpNet472
- dotnet test VBasicNet472
- dotnet test CSharpNet452
- dotnet test VBasicNet452

#uncomment when appveyor image will contain .NET Framework 4.8
#- dotnet test CSharpNet48
#- dotnet test VBasicNet48
- dotnet test CSharpNet46
- dotnet test VBasicNet46

artifacts:
- path: '*.nupkg'
- dotnet test CSharpNet461
- dotnet test VBasicNet461

- dotnet test CSharpNet462
- dotnet test VBasicNet462

- dotnet test CSharpNet47
- dotnet test VBasicNet47

- dotnet test CSharpNet471
- dotnet test VBasicNet471

- dotnet test CSharpNet472
- dotnet test VBasicNet472

artifacts:
- path: '*.nupkg'
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
23 October 2019, 1.6.4
----------------------

- update NUnit3TestAdapter to v3.15.1
- update Microsoft.NET.Test.Sdk to v16.3.0

6 August 2019, 1.6.3
--------------------

Expand Down
4 changes: 2 additions & 2 deletions nunit-template.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</packageTypes>
<releaseNotes>
- NUnit v3.12.0
- NUnit3TestAdapter v3.13.0
- Microsoft.NET.Test.Sdk v16.2.0
- NUnit3TestAdapter v3.15.1
- Microsoft.NET.Test.Sdk v16.3.0
</releaseNotes>
</metadata>
<files>
Expand Down

0 comments on commit f652ffa

Please sign in to comment.