diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml new file mode 100644 index 00000000..76c6eb4d --- /dev/null +++ b/.github/workflows/build-linux.yml @@ -0,0 +1,36 @@ +name: Build Linux +#on: [push, pull_request] +env: + DOTNET_CLI_TELEMETRY_OPTOUT: 1 +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 6.x + 8.x + + - name: Build Reason + run: "echo ref: ${{github.ref}} event: ${{github.event_name}}" + + - name: Build + shell: bash + run: | + for project in $(find ./src -name "*.csproj"); do + dotnet build --configuration Release $project + done + + - name: Run Tests + shell: bash + run: | + for project in $(find ./tests -name "*.csproj"); do + dotnet test --configuration Release $project + done + \ No newline at end of file diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml new file mode 100644 index 00000000..d879941d --- /dev/null +++ b/.github/workflows/build-osx.yml @@ -0,0 +1,35 @@ +name: Build OSX +#on: [push, pull_request] +env: + DOTNET_CLI_TELEMETRY_OPTOUT: 1 +jobs: + build: + runs-on: macOS-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 6.x + 8.x + + - name: Build Reason + run: "echo ref: ${{github.ref}} event: ${{github.event_name}}" + + - name: Build + shell: bash + run: | + for project in $(find ./src -name "*.csproj"); do + dotnet build --configuration Release $project + done + + - name: Run Tests + shell: bash + run: | + for project in $(find ./tests -name "*.csproj"); do + dotnet test --configuration Release $project + done diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml new file mode 100644 index 00000000..7db0d843 --- /dev/null +++ b/.github/workflows/build-windows.yml @@ -0,0 +1,90 @@ +name: Build Windows +on: [push, pull_request] +env: + DOTNET_CLI_TELEMETRY_OPTOUT: 1 +jobs: + build: + runs-on: windows-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup .NET Core + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 6.x + 8.x + + - name: Build Reason + run: "echo ref: ${{github.ref}} event: ${{github.event_name}}" + + - name: Build Version + shell: pwsh + run: | + $versionPropsPath = "./build/version.props" + [xml]$versionProps = Get-Content $versionPropsPath + $versionMajor = $versionProps.Project.PropertyGroup.VersionMajor + $versionMinor = $versionProps.Project.PropertyGroup.VersionMinor + $versionPatch = $versionProps.Project.PropertyGroup.VersionPatch + $versionQuality = $versionProps.Project.PropertyGroup.VersionQuality + $versionPrefix = "$versionMajor.$versionMinor.$versionPatch" + + if (-not [string]::IsNullOrWhiteSpace($versionQuality)) { + $versionPrefix = "$versionPrefix.$versionQuality" + } + + $tag = git tag --points-at HEAD + if ([string]::IsNullOrWhiteSpace($tag)) { + $timestamp = Get-Date -Format "yyyyMMddHHmmss" + $versionPrefix = "$versionPrefix-preview-$timestamp" + } + + echo "Full Version: $versionPrefix" + Add-Content -Path $Env:GITHUB_ENV -Value "FULL_VERSION=$versionPrefix" + + - name: Build + shell: bash + run: | + for project in $(find ./src -name "*.csproj"); do + dotnet build --configuration Release $project -p:Version=${{ env.FULL_VERSION }} + done + + - name: Run Tests + shell: bash + run: | + for project in $(find ./tests -name "*.csproj"); do + dotnet test --configuration Release $project + done + + - name: Package + shell: bash + if: github.event_name != 'pull_request' + run: | + for project in $(find ./src -name "*.csproj"); do + dotnet pack --configuration Release --no-build $project -p:PackageVersion=${{ env.FULL_VERSION }} -p:SymbolPackageFormat=snupkg --include-source --output ./artifacts/packages + done + + - name: Install GitHub Package Tool + if: github.event_name != 'pull_request' + run: dotnet tool install gpr -g + + - name: Publish CI Packages + shell: bash + if: github.event_name != 'pull_request' + run: | + for package in $(find ./artifacts/packages/ -name "*.nupkg" -o -name "*.snupkg"); do + echo "$package": Pushing $package... + + # GitHub + echo "Pushing to GitHub Package Registry..." + gpr push "$package" -k ${{ secrets.GITHUB_TOKEN }} || echo "Skipping: Package push failed or already exists." + + # myget + echo "Pushing to MyGet..." + dotnet nuget push "$package" \ + --source "https://www.myget.org/F/aspectcore/api/v2/package" \ + --api-key ${{ secrets.MYGET_API_TOKEN }} \ + --skip-duplicate || echo "Skipping: Package push failed or already exists." + done \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index f24ba047..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: '{build}' -os: Visual Studio 2022 -branches: - only: - - master -environment: - BUILDING_ON_PLATFORM: win - BuildEnvironment: appveyor -build_script: -- ps: ./build.ps1 -test: off -artifacts: -- path: artifacts/packages/*.nupkg -deploy: -- provider: NuGet - server: https://www.myget.org/F/aspectcore/api/v2/package - api_key: - secure: jpjXYvzq6XOX2E5PnhKPRBK/DKVoZAQ6Ok1UmWI3BuWq6rdtrGJMUJem/GtR8+qG - skip_symbols: true - artifact: /artifacts\/packages\/.+\.nupkg/ - on: - branch: master diff --git a/build.cake b/build.cake deleted file mode 100644 index de1af1de..00000000 --- a/build.cake +++ /dev/null @@ -1,104 +0,0 @@ -#addin "nuget:https://www.nuget.org/api/v2?package=Newtonsoft.Json&version=9.0.1" - -#load "./build/index.cake" - -var target = Argument("target", "Default"); - -var build = BuildParameters.Create(Context); -var util = new Util(Context, build); - -Task("Clean") - .Does(() => -{ - if (DirectoryExists("./artifacts")) - { - DeleteDirectory("./artifacts", new DeleteDirectorySettings(){ Force = true }); - } -}); - -Task("Restore") - .IsDependentOn("Clean") - .Does(() => -{ - var settings = new DotNetCoreRestoreSettings - { - ArgumentCustomization = args => - { - args.Append($"/p:VersionSuffix={build.Version.Suffix}"); - return args; - } - }; - foreach (var project in build.ProjectFiles) - { - DotNetCoreRestore(project.FullPath, settings); - } -}); - -Task("Build") - .IsDependentOn("Restore") - .Does(() => -{ - var settings = new DotNetCoreBuildSettings - { - Configuration = build.Configuration, - VersionSuffix = build.Version.Suffix, - ArgumentCustomization = args => - { - args.Append($"/p:InformationalVersion={build.Version.VersionWithSuffix()}"); - return args; - } - }; - foreach (var project in build.ProjectFiles) - { - DotNetCoreBuild(project.FullPath, settings); - } -}); - -Task("Test") - .IsDependentOn("Build") - .Does(() => -{ - foreach (var testProject in build.TestProjectFiles) - { - DotNetCoreTest(testProject.FullPath); - } -}); - -Task("Pack") - .Does(() => -{ - var settings = new DotNetCorePackSettings - { - Configuration = build.Configuration, - VersionSuffix = build.Version.Suffix, - IncludeSymbols = true, - OutputDirectory = "./artifacts/packages" - }; - foreach (var project in build.ProjectFiles) - { - DotNetCorePack(project.FullPath, settings); - } -}); - -Task("Default") - .IsDependentOn("Build") - .IsDependentOn("Test") - .IsDependentOn("Pack") - .Does(() => -{ - util.PrintInfo(); -}); - -Task("Version") - .Does(() => -{ - Information($"{build.FullVersion()}"); -}); - -Task("Print") - .Does(() => -{ - util.PrintInfo(); -}); - -RunTarget(target); diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index e81a4597..00000000 --- a/build.ps1 +++ /dev/null @@ -1,279 +0,0 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## - -<# - -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. - -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. - -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER ShowDescription -Shows description about tasks. -.PARAMETER DryRun -Performs a dry run. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script, - [string]$Target, - [string]$Configuration, - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity, - [switch]$ShowDescription, - [Alias("WhatIf", "Noop")] - [switch]$DryRun, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -# This is an automatic variable in PowerShell Core, but not in Windows PowerShell 5.x -if (-not (Test-Path variable:global:IsCoreCLR)) { - $IsCoreCLR = $false -} - -# Attempt to set highest encryption available for SecurityProtocol. -# PowerShell will not set this by default (until maybe .NET 4.6.x). This -# will typically produce a message for PowerShell v2 (just an info -# message though) -try { - # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) - # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't - # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is - # installed (.NET 4.5 is an in-place upgrade). - # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that. - if (-not $IsCoreCLR) { - [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 - } - } catch { - Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' - } - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - - if ($md5 -ne $null) - { - $md5.Dispose() - } - } -} - -function GetProxyEnabledWebClient -{ - $wc = New-Object System.Net.WebClient - $proxy = [System.Net.WebRequest]::GetSystemWebProxy() - $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials - $wc.Proxy = $proxy - return $wc -} - -Write-Host "Preparing to run build script..." - -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -} - -if(!$Script){ - $Script = Join-Path $PSScriptRoot "build.cake" -} -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" -$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" - -$env:CAKE_PATHS_TOOLS = $TOOLS_DIR -$env:CAKE_PATHS_ADDINS = $ADDINS_DIR -$env:CAKE_PATHS_MODULES = $MODULES_DIR - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type Directory | Out-Null -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) - } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# These are automatic variables in PowerShell Core, but not in Windows PowerShell 5.x -if (-not (Test-Path variable:global:ismacos)) { - $IsLinux = $false - $IsMacOS = $false -} - -# Save nuget.exe path to environment to be available to child processed -$env:NUGET_EXE = $NUGET_EXE -$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$NUGET_EXE`"" -} else { - "`"$NUGET_EXE`"" -} - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | - Remove-Item -Recurse -Force - } - - Write-Verbose -Message "Restoring tools from NuGet..." - - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore addins from NuGet -if (Test-Path $ADDINS_PACKAGES_CONFIG) { - Push-Location - Set-Location $ADDINS_DIR - - Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet addins." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore modules from NuGet -if (Test-Path $MODULES_PACKAGES_CONFIG) { - Push-Location - Set-Location $MODULES_DIR - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet modules." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$CAKE_EXE`"" -} else { - "`"$CAKE_EXE`"" -} - - # Build an array (not a string) of Cake arguments to be joined later -$cakeArguments = @() -if ($Script) { $cakeArguments += "`"$Script`"" } -if ($Target) { $cakeArguments += "--target=`"$Target`"" } -if ($Configuration) { $cakeArguments += "--configuration=$Configuration" } -if ($Verbosity) { $cakeArguments += "--verbosity=$Verbosity" } -if ($ShowDescription) { $cakeArguments += "--showdescription" } -if ($DryRun) { $cakeArguments += "--dryrun" } -$cakeArguments += $ScriptArgs - -# Start Cake -Write-Host "Running build script..." -Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")" -exit $LASTEXITCODE \ No newline at end of file diff --git a/build/index.cake b/build/index.cake deleted file mode 100644 index f0684bf1..00000000 --- a/build/index.cake +++ /dev/null @@ -1,2 +0,0 @@ -#load "./util.cake" -#load "./version.cake" diff --git a/build/util.cake b/build/util.cake deleted file mode 100644 index db42eb7c..00000000 --- a/build/util.cake +++ /dev/null @@ -1,25 +0,0 @@ -public class Util -{ - public Util(ICakeContext context, BuildParameters build) - { - Context = context; - Build = build; - } - - public ICakeContext Context { get; set; } - public BuildParameters Build { get; set; } - - public void PrintInfo() - { - Context.Information($@" -Version: {Build.FullVersion()} -Configuration: {Build.Configuration} -"); - } - - public static string CreateStamp() - { - var seconds = (long)(DateTime.UtcNow - new DateTime(2017, 1, 1)).TotalSeconds; - return seconds.ToString(); - } -} diff --git a/build/version.cake b/build/version.cake deleted file mode 100644 index ed534eb7..00000000 --- a/build/version.cake +++ /dev/null @@ -1,120 +0,0 @@ -using System.Xml; - -public class BuildParameters -{ - public BuildParameters(ICakeContext context) - { - Context = context; - } - - public ICakeContext Context { get; } - public BuildVersion Version { get; private set; } - public string Configuration { get; private set; } - public bool IsTagged { get; private set; } - public bool IsCI { get; private set; } - public DirectoryPathCollection Projects { get; set; } - public DirectoryPathCollection TestProjects { get; set; } - public FilePathCollection ProjectFiles { get; set; } - public FilePathCollection TestProjectFiles { get; set; } - - public static BuildParameters Create(ICakeContext context) - { - var buildParameters = new BuildParameters(context); - buildParameters.Initialize(); - return buildParameters; - } - - public string FullVersion() - { - return Version.VersionWithSuffix(); - } - - private void Initialize() - { - InitializeCore(); - InitializeVersion(); - } - - private void InitializeCore() - { - Projects = Context.GetDirectories("./src/*"); - TestProjects = Context.GetDirectories("./tests/*"); - ProjectFiles = Context.GetFiles("./src/*/*.csproj"); - TestProjectFiles = Context.GetFiles("./tests/*/*.csproj"); - - var buildSystem = Context.BuildSystem(); - if (!buildSystem.IsLocalBuild) - { - IsCI = true; - if ((buildSystem.IsRunningOnAppVeyor && buildSystem.AppVeyor.Environment.Repository.Tag.IsTag) || - (buildSystem.IsRunningOnTravisCI && string.IsNullOrWhiteSpace(buildSystem.TravisCI.Environment.Build.Tag))) - { - IsTagged = true; - } - } - - Configuration = Context.Argument("Configuration", "Debug"); - if (IsCI) - { - Configuration = "Release"; - } - } - - private void InitializeVersion() - { - var versionFile = Context.File("./build/version.props"); - var content = System.IO.File.ReadAllText(versionFile.Path.FullPath); - - XmlDocument doc = new XmlDocument(); - doc.LoadXml(content); - - var versionMajor = doc.DocumentElement.SelectSingleNode("/Project/PropertyGroup/VersionMajor").InnerText; - var versionMinor = doc.DocumentElement.SelectSingleNode("/Project/PropertyGroup/VersionMinor").InnerText; - var versionPatch = doc.DocumentElement.SelectSingleNode("/Project/PropertyGroup/VersionPatch").InnerText; - var versionQuality = doc.DocumentElement.SelectSingleNode("/Project/PropertyGroup/VersionQuality").InnerText; - versionQuality = string.IsNullOrWhiteSpace(versionQuality) ? null : versionQuality; - - var suffix = versionQuality; - if (!IsTagged) - { - suffix += (IsCI ? "preview-" : "dv-") + Util.CreateStamp(); - } - suffix = string.IsNullOrWhiteSpace(suffix) ? null : suffix; - - Version = - new BuildVersion(int.Parse(versionMajor), int.Parse(versionMinor), int.Parse(versionPatch), versionQuality); - Version.Suffix = suffix; - } -} - -public class BuildVersion -{ - public BuildVersion(int major, int minor, int patch, string quality) - { - Major = major; - Minor = minor; - Patch = patch; - Quality = quality; - } - - public int Major { get; set; } - public int Minor { get; set; } - public int Patch { get; set; } - public string Quality { get; set; } - public string Suffix { get; set; } - - public string VersionWithoutQuality() - { - return $"{Major}.{Minor}.{Patch}"; - } - - public string Version() - { - return VersionWithoutQuality() + (Quality == null ? string.Empty : $"-{Quality}"); - } - - public string VersionWithSuffix() - { - return Version() + (Suffix == null ? string.Empty : $"-{Suffix}"); - } -} diff --git a/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj b/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj index d8f50a7f..cb30fb92 100644 --- a/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj +++ b/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj @@ -33,13 +33,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj b/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj index 800df4c4..19a4e4b0 100644 --- a/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj +++ b/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj @@ -21,9 +21,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj b/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj index 234adcb1..b08c72d6 100644 --- a/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj +++ b/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj @@ -28,13 +28,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj b/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj index 7979d972..0cddc8ab 100644 --- a/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj +++ b/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj b/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj index 32ad3bd1..b6c9c85f 100644 --- a/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj +++ b/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj @@ -11,12 +11,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj b/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj index 732fe369..f11018b3 100644 --- a/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj +++ b/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj @@ -22,13 +22,13 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj b/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj index cc8ce863..d7f71219 100644 --- a/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj +++ b/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj @@ -19,9 +19,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/AspectCore.Tests/AspectCore.Tests.csproj b/tests/AspectCore.Tests/AspectCore.Tests.csproj index d3e6679f..c55d691f 100644 --- a/tests/AspectCore.Tests/AspectCore.Tests.csproj +++ b/tests/AspectCore.Tests/AspectCore.Tests.csproj @@ -17,9 +17,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive