Skip to content
Draft
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
5 changes: 5 additions & 0 deletions .github/workflows/NUnit.Engine.Api.CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ jobs:
- name: 🛠️ Install dotnet tools
run: dotnet tool restore

# For reasons I don't understand, the Cake script doesn't work in a workflow
# unless they are restored before the script runs, which this command does.
- name: 🛠️ List Packages
run: dotnet list package --include-transitive

- name: 🔨 Build, Test, Package and Publish (Cake script decides)
run: dotnet cake --target=ContinuousIntegration --configuration=Release #--verbosity=diagnostic

Expand Down
20 changes: 20 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitiveVersionPinningEnabled>true</CentralPackageTransitiveVersionPinningEnabled>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="CSharpIsNullAnalyzer" Version="0.1.593" />
<PackageVersion Include="IsExternalInit" Version="1.0.3" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="NUnit" Version="4.3.2" />
<PackageVersion Include="NUnitLite" Version="4.3.2" />
<PackageVersion Include="NUnit.Extensibility.Api" Version="4.0.0-beta.3" />
<PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
<PackageVersion Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.160" />
</ItemGroup>

</Project>

23 changes: 17 additions & 6 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="NUnit MyGet Feed" value="https://www.myget.org/F/nunit/api/v3/index.json" />
<add key="Local Packages" value="C:\Users\charlie\dev\LocalPackages" />
</packageSources>
<packageSources>
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="myget" value="https://www.myget.org/F/nunit/api/v3/index.json" />
<add key="local" value="packages" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget">
<package pattern="*" />
</packageSource>
<packageSource key="myget">
<package pattern="NUnit.Cake.Recipe" />
</packageSource>
<packageSource key="local">
<package pattern="NUnit.Engine.Api" />
</packageSource>
</packageSourceMapping>
</configuration>
6 changes: 3 additions & 3 deletions build.cake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Load the recipe
#load nuget:?package=NUnit.Cake.Recipe&version=2.0.0-beta.4.7
#load nuget:?package=NUnit.Cake.Recipe&version=2.0.0-beta.4.8
// Comment out above line and uncomment below for local tests of recipe changes
//#load ../NUnit.Cake.Recipe/src/NUnit.Cake.Recipe/content/*.cake
//#load ../NUnit.Cake.Recipe/recipe/*.cake

// Initialize BuildSettings
BuildSettings.Initialize(
Expand All @@ -22,7 +22,7 @@ BuildSettings.Packages.Add(new NuGetPackage(
HasFile("LICENSE.txt"),
HasDirectory("lib/net462").WithFile("nunit.engine.api.dll"),
HasDirectory("lib/netstandard2.0").WithFile("nunit.engine.api.dll"),
HasDependency("NUnit.Extensibility.Api", "4.0.0-beta.2.2")
HasDependency("NUnit.Extensibility.Api", "4.0.0-beta.3")
},
symbols: new PackageCheck[] {
HasDirectory("lib/net462").WithFile("nunit.engine.api.pdb"),
Expand Down
16 changes: 6 additions & 10 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
<!-- Debugging -->
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<!-- Commonly Used Package Versions -->
<AnnotatedReferenceAssemblyVersion>8.0.0</AnnotatedReferenceAssemblyVersion>
<NUnitExtensibilityVersion>4.0.0-beta.2.2</NUnitExtensibilityVersion>
<NUnitFrameworkVersion>4.3.2</NUnitFrameworkVersion>
<!-- Informational Settings -->
<Company>NUnit Software</Company>
<Product>NUnit 4 Runner and Engine</Product>
Expand All @@ -36,13 +32,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(ExposedInternals)' != 'true'">
<PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
<PackageReference Include="IsExternalInit" PrivateAssets="all" />
<PackageReference Include="Nullable" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) OR $(TargetFramework.StartsWith('netstandard'))">
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(AnnotatedReferenceAssemblyVersion)]" />
<PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.160" PrivateAssets="all" />
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[8.0.0]" />
<PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" PrivateAssets="all" />
</ItemGroup>

<!-- Common package metadata, may be overridden in individual projects -->
Expand Down Expand Up @@ -72,9 +68,9 @@

<!-- Code Style Analyzers -->
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers.Unstable" PrivateAssets="all" />
<GlobalAnalyzerConfigFiles Include="$(MSBuildThisFileDirectory)/StyleCop.Analyzers.globalconfig" />
<PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" PrivateAssets="all" />
<PackageReference Include="CSharpIsNullAnalyzer" PrivateAssets="all" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/NUnit.Engine.Api.Tests/NUnit.Engine.Api.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="$(NUnitFrameworkVersion)" />
<PackageReference Include="NUnitLite" Version="$(NUnitFrameworkVersion)" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnitLite" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/NUnit.Engine.Api/NUnit.Engine.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit.Extensibility.Api" Version="$(NUnitExtensibilityVersion)" />
<PackageReference Include="NUnit.Extensibility.Api" />
</ItemGroup>

</Project>