Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manual deps upgrade + only run net462 tests on Windows #37

Merged
merged 4 commits into from
Jul 1, 2023
+12 −7
Merged

Manual deps upgrade + only run net462 tests on Windows #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
449359a
Merging dependencies upgrade together
asimmon Jul 1, 2023
6f57c2c
Only run net462 tests on Windows (avoiding Mono on Unix)
asimmon Jul 1, 2023
245c70f
Added more logs in the test Cake task
asimmon Jul 1, 2023
2bc6e9c
Removing macOS from CI builds as it seems to have an error starting t…
asimmon Jul 1, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
needs: [pack]
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
needs: [pack]
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
steps:
- uses: actions/checkout@v3
with:
Expand Down
5 changes: 5 additions & 0 deletions build/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,23 +405,27 @@ public override void Run(BuildContext context)

foreach (var packageName in packageNames)
{
context.Log.Information($"=============== Add package {packageName} ===============");
context.DotNetAddPackage(Constants.TestProjectPath, packageName, version: packageVersion, preRelease: true);

try
{
context.Log.Information($"=============== Dotnet restore {packageName} ===============");
context.DotNetRestore(Constants.TestProjectPath, new DotNetRestoreSettings
{
Force = true,
NoCache = true,
});

context.Log.Information($"=============== Dotnet build {packageName} ===============");
context.DotNetBuild(Constants.TestProjectPath, new DotNetBuildSettings
{
Configuration = Constants.Release,
NoRestore = true,
NoLogo = true,
});

context.Log.Information($"=============== Dotnet test {packageName} ===============");
context.DotNetTest(Constants.TestProjectPath, new DotNetTestSettings
{
Configuration = Constants.Release,
Expand All @@ -433,6 +437,7 @@ public override void Run(BuildContext context)
}
finally
{
context.Log.Information($"=============== Remove package {packageName} ===============");
context.DotNetRemovePackage(Constants.TestProjectPath, packageName);
}
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.406",
"version": "6.0.411",
"rollForward": "latestMinor",
"allowPrerelease": false
}
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions src/EphemeralMongo.Core.Tests/EphemeralMongo.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;net6.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net462;net6.0</TargetFrameworks>
<TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GSoft.Extensions.Xunit" Version="1.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.5.0" Condition=" '$(OS)' != 'Windows_NT' " />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Expand Down