Add GitHub Actions jobs to test libraries on Windows and Linux (.NET & .NET Standard)

.github/workflows/github_build_and_publish.yml

@@ -9,7 +9,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
 
     steps:
     # Шаг 1: Клонируем репозиторий
@@ -23,13 +27,18 @@ jobs:
           8.0.x
           9.0.x
 
+    - name: Build Windows
+      if: runner.os == 'Windows'
+      run: |
+        ./build.ps1 --target=Travis --verbosity=normal --ForceUploadPackages=false
+      shell: powershell
+
     # Шаг 3: Сборка проекта
     - name: Build
+      if: runner.os == 'Linux'
       env:
         UPLOAD_NUGET: ${{ secrets.UPLOAD_NUGET }}
         UPLOAD_NUGET_API_KEY: ${{ secrets.UPLOAD_NUGET_API_KEY }}
       run: |
         chmod a+x ./build.sh
         ./build.sh --target=Travis --verbosity=normal --ForceUploadPackages=true
-
-

build.cake

@@ -2,7 +2,7 @@
 // IMPORTS
 ///////////////////////////////////////////////////////////////////////////////
 
-#load tools/microelements.devops/1.9.1/scripts/imports.cake
+#load tools/microelements.devops/1.11.0/scripts/imports.cake
 
 ///////////////////////////////////////////////////////////////////////////////
 // SCRIPT ARGS AND CONVENTIONS
@@ -21,9 +21,28 @@ ScriptArgs args = new ScriptArgs(Context)
 Task("Build")
     .Does(() => args.Build().BuildSamples());
 
-Task("Test")
-    .WithCriteria(()=>args.RunTests)
-    .Does(() => RunTests(args));
+var isWindows = Environment.Platform.Family == PlatformFamily.Windows;
+Task("Tests")
+    .Does(() =>
+    {
+        var solution = "MicroElements.Swashbuckle.FluentValidation.sln";
+
+        if (isWindows)
+        {
+            Information("Executing tests net481, net8.0, net9.0 on Windows");
+
+            DotNetTest(solution, new DotNetTestSettings { Framework = "net481" });
+            DotNetTest(solution, new DotNetTestSettings { Framework = "net8.0" });
+            DotNetTest(solution, new DotNetTestSettings { Framework = "net9.0" });
+        }
+        else
+        {
+            Information("Executing tests net8.0 y net9.0 on Linux/macOS");
+
+            DotNetTest(solution, new DotNetTestSettings { Framework = "net8.0" });
+            DotNetTest(solution, new DotNetTestSettings { Framework = "net9.0" });
+        }
+    });
 
 Task("UploadTestResultsToAppVeyor")
     .WithCriteria(()=>args.RunTests)
@@ -68,4 +87,4 @@ Task("AppVeyor")
     .IsDependentOn("UploadTestResultsToAppVeyor")
     ;
 
-RunTarget(args.Target);
+RunTarget(args.Target);

build.ps1

@@ -20,7 +20,7 @@ if(!$PSScriptRoot){
     $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 }
 
-$CAKE_VERSION = "0.38.0"
+$CAKE_VERSION = "1.3.0"
 $DEVOPS_VERSION = "1.11.0"
 $NUGET_URL = "https://api.nuget.org/v3/index.json"
 $NUGET_BETA_URL = "https://www.myget.org/F/micro-elements/api/v3/index.json"
@@ -63,6 +63,7 @@ if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
 $cakeArguments += ("--rootDir="+@("$PSScriptRoot"));
 $cakeArguments += ("--devOpsVersion=$DEVOPS_VERSION");
 $cakeArguments += ("--devOpsRoot=""$TOOLS_DIR/microelements.devops/$DEVOPS_VERSION""");
+$cakeArguments += ("--ForceUploadPackages=false")
 $cakeArguments += $ScriptArgs
 
 # Start Cake

build.sh

@@ -18,14 +18,15 @@ TOOLS_DIR=$SCRIPT_DIR/tools
 SCRIPT=$TOOLS_DIR/microelements.devops/$DEVOPS_VERSION/scripts/main.cake
 
 CAKE_PROPS_PATH=$TOOLS_DIR/cake.props
-CAKE_VERSION="0.38.0"
+CAKE_VERSION="1.3.0"
 CAKE_ARGUMENTS=()
 
 # Parse arguments.
 for i in "$@"; do
     case $1 in
         -s|--script) SCRIPT="$2"; shift ;;
         --cake-version) CAKE_VERSION="--version=$2"; shift ;;
+        --ForceUploadPackages=*|--ForceUploadPackages) ;;
         --) shift; CAKE_ARGUMENTS+=("$@"); break ;;
         *) CAKE_ARGUMENTS+=("$1") ;;
     esac
@@ -35,6 +36,7 @@ done
 CAKE_ARGUMENTS+=("--rootDir=$SCRIPT_DIR");
 CAKE_ARGUMENTS+=("--devOpsVersion=$DEVOPS_VERSION");
 CAKE_ARGUMENTS+=("--devOpsRoot=$TOOLS_DIR/microelements.devops/$DEVOPS_VERSION");
+CAKE_ARGUMENTS+=("--ForceUploadPackages=false")
 
 echo "===========VARIABLES============"
 echo "SCRIPT_DIR: $SCRIPT_DIR"
@@ -80,4 +82,4 @@ dotnet tool restore
 echo "Running build script..."
 CMD="dotnet cake $SCRIPT ${CAKE_ARGUMENTS[@]}"
 echo $CMD
-exec $CMD
+exec $CMD

samples/MinimalApi/MinimalApi.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.*-*" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>

samples/SampleNSwagWebApi/SampleNSwagWebApi.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.*-*" />
     <PackageReference Include="NSwag.AspNetCore" Version="14.4.0" />
   </ItemGroup>
 

samples/SampleWebApi/SampleWebApi.csproj

@@ -12,8 +12,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.*-*" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.*-*" />
     <PackageReference Include="NJsonSchema" Version="11.3.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="8.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <PropertyGroup>

src/MicroElements.NSwag.FluentValidation/MicroElements.NSwag.FluentValidation.csproj

@@ -13,6 +13,7 @@
   <Import Project="..\common.props" />
 
   <ItemGroup>
+    <PackageReference Include="MicroElements.IsExternalInit" Version="1.1.0" PrivateAssets="all" />
     <PackageReference Include="NJsonSchema" Version="11.3.2" />
   </ItemGroup>
 

src/MicroElements.OpenApi.FluentValidation/MicroElements.OpenApi.FluentValidation.csproj

@@ -16,8 +16,8 @@
     <PackageReference Include="MicroElements.CodeContracts.Sources" Version="1.4.0" PrivateAssets="all" />
     <PackageReference Include="MicroElements.IsExternalInit" Version="1.1.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.*-*" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.*-*" />
   </ItemGroup>
 
 </Project>

src/MicroElements.Swashbuckle.FluentValidation/MicroElements.Swashbuckle.FluentValidation.csproj

@@ -13,7 +13,9 @@
   <Import Project="..\common.props" />
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="[6.3.0, 9)" />
+    <PackageReference Include="MicroElements.IsExternalInit" Version="1.1.0" PrivateAssets="all" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.*-*" Condition="'$(TargetFramework)' == 'netstandard2.0'"/>
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="9.0.*-*" Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'"/>
   </ItemGroup>
 
   <ItemGroup>

src/MicroElements.Swashbuckle.FluentValidation/Swashbuckle/ScopedSwaggerMiddleware.cs

@@ -1,51 +1,51 @@
-// Copyright (c) MicroElements. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//// Copyright (c) MicroElements. All rights reserved.
+//// Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Swashbuckle.AspNetCore.Swagger;
+//using Microsoft.AspNetCore.Builder;
+//using Microsoft.AspNetCore.Http;
+//using Swashbuckle.AspNetCore.Swagger;
+//using System;
+//using System.Threading.Tasks;
 
-namespace MicroElements.Swashbuckle.FluentValidation
-{
-    /// <summary>
-    /// SwaggerMiddleware that resolves <see cref="ISwaggerProvider"/> on scope.
-    /// Resolves problems with validators with dependency on scoped services.
-    /// </summary>
-    public class ScopedSwaggerMiddleware
-    {
-        private readonly RequestDelegate _next;
-        private readonly SwaggerOptions _options;
+//namespace MicroElements.Swashbuckle.FluentValidation
+//{
+//    /// <summary>
+//    /// SwaggerMiddleware that resolves <see cref="ISwaggerProvider"/> on scope.
+//    /// Resolves problems with validators with dependency on scoped services.
+//    /// </summary>
+//    public class ScopedSwaggerMiddleware
+//    {
+//        private readonly RequestDelegate _next;
+//        private readonly SwaggerOptions _options;
 
-        /// <summary>
-        /// ctor.
-        /// </summary>
-        /// <param name="next"></param>
-        /// <param name="options"></param>
-        public ScopedSwaggerMiddleware(RequestDelegate next, SwaggerOptions options)
-        {
-            _next = next;
-            _options = options;
-        }
+//        /// <summary>
+//        /// ctor.
+//        /// </summary>
+//        /// <param name="next"></param>
+//        /// <param name="options"></param>
+//        public ScopedSwaggerMiddleware(RequestDelegate next, SwaggerOptions options)
+//        {
+//            _next = next;
+//            _options = options;
+//        }
 
-        public async Task Invoke(HttpContext httpContext, ISwaggerProvider swaggerProvider)
-        {
-            await new SwaggerMiddleware(_next, _options).Invoke(httpContext, swaggerProvider);
-        }
-    }
+//        public async Task Invoke(HttpContext httpContext, ISwaggerProvider swaggerProvider)
+//        {
+//            await new SwaggerMiddleware(_next, _options).Invoke(httpContext, swaggerProvider);
+//        }
+//    }
 
-    public static class SwaggerBuilderExtensions
-    {
-        /// <summary>
-        /// Replaces standard <see cref="SwaggerMiddleware"/> with <see cref="ScopedSwaggerMiddleware"/>.
-        /// Use instead of <see cref="SwaggerBuilderExtensions.UseSwagger"/> if you have services with scoped services like DbContext.
-        /// </summary>
-        public static IApplicationBuilder UseScopedSwagger(this IApplicationBuilder app, Action<SwaggerOptions> setupAction = null)
-        {
-            SwaggerOptions swaggerOptions = new SwaggerOptions();
-            setupAction?.Invoke(swaggerOptions);
-            return app.UseMiddleware<ScopedSwaggerMiddleware>(swaggerOptions);
-        }
-    }
-}
+//    public static class SwaggerBuilderExtensions
+//    {
+//        /// <summary>
+//        /// Replaces standard <see cref="SwaggerMiddleware"/> with <see cref="ScopedSwaggerMiddleware"/>.
+//        /// Use instead of <see cref="SwaggerBuilderExtensions.UseSwagger"/> if you have services with scoped services like DbContext.
+//        /// </summary>
+//        public static IApplicationBuilder UseScopedSwagger(this IApplicationBuilder app, Action<SwaggerOptions> setupAction = null)
+//        {
+//            SwaggerOptions swaggerOptions = new SwaggerOptions();
+//            setupAction?.Invoke(swaggerOptions);
+//            return app.UseMiddleware<ScopedSwaggerMiddleware>(swaggerOptions);
+//        }
+//    }
+//}

test/MicroElements.Swashbuckle.FluentValidation.Tests/MicroElements.Swashbuckle.FluentValidation.Tests.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net481;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="8.3.0" />
+    <PackageReference Include="FluentAssertions" Version="8.4.0" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.1" Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="9.0.3" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1" PrivateAssets="all" />
   </ItemGroup>