diff --git a/.gitattributes b/.gitattributes index 2f1672cb..78ed7ef1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,73 @@ -# ensure CRLF endings on all checkouts +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Ensure CRLF endings on all checkouts +############################################################################### *.cs eol=crlf *.tt eol=crlf *.ttinclude eol=crlf *.csproj eol=crlf *.cmd eol=crlf -*.sln eol=crlf \ No newline at end of file +*.sln eol=crlf + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index c974f499..759ee4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,38 +1,399 @@ -#ignore thumbnails created by windows -Thumbs.db -#Ignore files build by Visual Studio -*.obj -*.pdb +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo *.user -*.aps -*.pch -*.vspscc +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +.artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c -*.ncb -*.suo +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr *.tlb +*.tli *.tlh -*.bak -*.cache -*.ilk +*.tmp +*.tmp_proj +*_wpftmp.csproj *.log -*.cs.ide -[Bb]in -[Dd]ebug*/ -*.lib -*.sbr -obj/ -[Rr]elease*/ +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in _ReSharper*/ -[Tt]est[Rr]esult* -.vs/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages *.nupkg -!*.dll -!*.exe -!*.pdb -packages/ -Help/ -.idea/ -*.snupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml diff --git a/Build/Build.csproj b/Build/Build.csproj index e82933b0..3fd078bd 100644 --- a/Build/Build.csproj +++ b/Build/Build.csproj @@ -1,5 +1,6 @@  + - net472 + netstandard2.0 \ No newline at end of file diff --git a/Build/BuildScripts/CodeJam.AppVeyor.NUnit.Tests.ps1 b/Build/BuildScripts/CodeJam.AppVeyor.NUnit.Tests.ps1 deleted file mode 100644 index 79325e97..00000000 --- a/Build/BuildScripts/CodeJam.AppVeyor.NUnit.Tests.ps1 +++ /dev/null @@ -1,49 +0,0 @@ -$include = "*.Tests.dll", "*.Tests.NUnit.dll" - -mkdir "$env:APPVEYOR_BUILD_FOLDER\_Results" -ErrorAction SilentlyContinue - -$wc = New-Object System.Net.WebClient - -#run .net tests -$targetsDotNet = "net48;net472;net471;net47;net461;net45;net40;net35" -split ";" -foreach ($target in $targetsDotNet) { - $logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml" - $testAssemblies = (Get-ChildItem -include $include -r | ` - Where-Object { $_.fullname -match "\\bin\\Release\\$($target)(?!.*ref)" } | ` - Select-Object -ExpandProperty FullName) - - Write-Output "" - Write-Output "=== $target ===" - Write-Output "nunit3-console $testAssemblies --result=$logFileName" - &"nunit3-console" $testAssemblies "--result=$logFileName" - if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } - - Write-Output "UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID", "$logFileName") - if ($LastExitCode -ne 0) { - Write-Output "FAIL: UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $host.SetShouldExit($LastExitCode) - } -} - -#run .net core tests -$targetsDotNetCore = "net6.0;net5.0;netcoreapp3.1" -split ";" -foreach ($target in $targetsDotNetCore) { - $logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml" - $testAssemblies = (Get-ChildItem -include $include -r | ` - Where-Object { $_.fullname -match "\\bin\\Release\\$($target)(?!.*ref)" } | ` - Select-Object -ExpandProperty FullName) - - Write-Output "" - Write-Output "=== $target ===" - Write-Output "dotnet vstest $testAssemblies --logger:'trx;LogFileName=$logFileName'" - dotnet vstest $testAssemblies --logger:"trx;LogFileName=$logFileName" - if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } - - Write-Output "UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID", "$logFileName") - if ($LastExitCode -ne 0) { - Write-Output "FAIL: UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $host.SetShouldExit($LastExitCode) - } -} diff --git a/Build/BuildScripts/CodeJam.PerfTests.AppVeyor.NUnit.Tests.ps1 b/Build/BuildScripts/CodeJam.PerfTests.AppVeyor.NUnit.Tests.ps1 deleted file mode 100644 index 83c298e5..00000000 --- a/Build/BuildScripts/CodeJam.PerfTests.AppVeyor.NUnit.Tests.ps1 +++ /dev/null @@ -1,46 +0,0 @@ -$include = "*.Tests.dll", "*.Tests.NUnit.dll" - -mkdir "$env:APPVEYOR_BUILD_FOLDER\_Results" -ErrorAction SilentlyContinue - -$wc = New-Object System.Net.WebClient - -$targetsDotNet = "net47","net46","net45","net40","net35","net20" -foreach ($target in $targetsDotNet) { - #run .net tests - $logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml" - $a = (gci -include $include -r | ` - where { $_.fullname -match "\\bin\\Release\\$($target)" -and $_.fullname } | ` - select -ExpandProperty FullName) - $framework = $target.Substring(0, $target.Length - 2) + "-" + $target.Substring($target.Length - 2, 1) + "." + $target.Substring($target.Length - 1) - echo "nunit3-console $a --result=$logFileName" - &"nunit3-console" $a "--result=$logFileName" - if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } - echo "UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID", "$logFileName") - if ($LastExitCode -ne 0) { - echo "FAIL: UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $host.SetShouldExit($LastExitCode) - } -} - -#run .net core tests -$targetsDotNetCore = "netcoreapp2.0","netcoreapp1.1","netcoreapp1.0" -foreach ($target in $targetsDotNetCore) { - $a = (gci -include $include -r | ` - where { $_.fullname -match "\\bin\\Release\\$($target)" -and $_.fullname } | ` - select -ExpandProperty FullName) - - $logFileName = "$env:APPVEYOR_BUILD_FOLDER\_Results\$($target)_nunit_results.xml" - echo "dotnet vstest $a --logger:'trx;LogFileName=$logFileName'" - dotnet vstest $a --logger:"trx;LogFileName=$logFileName" - if ($LastExitCode -ne 0) { - echo "FAIL: dotnet vstest $a --logger:'trx;LogFileName=$logFileName'" - $host.SetShouldExit($LastExitCode) - } - echo "UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID", "$logFileName") - if ($LastExitCode -ne 0) { - echo "FAIL: UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $logFileName" - $host.SetShouldExit($LastExitCode) - } -} diff --git a/CodeJam.Blocks.Tests/CodeJam.Blocks.Tests.csproj b/CodeJam.Blocks.Tests/CodeJam.Blocks.Tests.csproj index 07a668ce..b48c13ce 100644 --- a/CodeJam.Blocks.Tests/CodeJam.Blocks.Tests.csproj +++ b/CodeJam.Blocks.Tests/CodeJam.Blocks.Tests.csproj @@ -6,6 +6,8 @@ {2A52D7F6-AAFC-4AC4-9901-252C13D96E53} Library net6.0;net5.0;net48;net472;net471;net47;net461;net45;net40;net35;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 + net48;net472;net471;net47;net461;net45;net40;net35 true @@ -19,7 +21,7 @@ - + diff --git a/CodeJam.Experimental.Tests/CodeJam.Experimental.Tests.csproj b/CodeJam.Experimental.Tests/CodeJam.Experimental.Tests.csproj index f78b277d..0efed98b 100644 --- a/CodeJam.Experimental.Tests/CodeJam.Experimental.Tests.csproj +++ b/CodeJam.Experimental.Tests/CodeJam.Experimental.Tests.csproj @@ -6,6 +6,8 @@ {F6F97573-4D26-4217-89F6-819DF96FCB4A} Library net6.0;net461;netcoreapp2.1 + net6.0;netcoreapp2.1 + net461 true diff --git a/CodeJam.Main.Tests/CodeJam.Main.Tests.csproj b/CodeJam.Main.Tests/CodeJam.Main.Tests.csproj index b71aed32..5f99231b 100644 --- a/CodeJam.Main.Tests/CodeJam.Main.Tests.csproj +++ b/CodeJam.Main.Tests/CodeJam.Main.Tests.csproj @@ -6,6 +6,8 @@ {DD65E3F2-9658-4242-A8AA-056028473CB1} Library net6.0;net5.0;net48;net472;net471;net47;net461;net45;net40;net35;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 + net48;net472;net471;net47;net461;net45;net40;net35 true true @@ -93,7 +95,7 @@ - + diff --git a/CodeJam.sln b/CodeJam.sln index e8484c0b..c9208a3e 100644 --- a/CodeJam.sln +++ b/CodeJam.sln @@ -39,6 +39,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeJam.Experimental", "Cod EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeJam.Experimental.Tests", "CodeJam.Experimental.Tests\CodeJam.Experimental.Tests.csproj", "{F6F97573-4D26-4217-89F6-819DF96FCB4A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pipelines", "Pipelines\Pipelines.csproj", "{CA211D0B-4C2E-4AC8-AD48-FD5838EDC65E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -73,6 +75,10 @@ Global {F6F97573-4D26-4217-89F6-819DF96FCB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU {F6F97573-4D26-4217-89F6-819DF96FCB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU {F6F97573-4D26-4217-89F6-819DF96FCB4A}.Release|Any CPU.Build.0 = Release|Any CPU + {CA211D0B-4C2E-4AC8-AD48-FD5838EDC65E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CA211D0B-4C2E-4AC8-AD48-FD5838EDC65E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA211D0B-4C2E-4AC8-AD48-FD5838EDC65E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CA211D0B-4C2E-4AC8-AD48-FD5838EDC65E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -85,6 +91,7 @@ Global {2A52D7F6-AAFC-4AC4-9901-252C13D96E53} = {3C9AF2DF-1323-4471-B4DE-DE3D1A2A580C} {7BD77DA2-A731-400C-A88E-215FC592E6E3} = {D56CF63D-0A29-4F5A-8E2C-0DAF338119EE} {F6F97573-4D26-4217-89F6-819DF96FCB4A} = {D56CF63D-0A29-4F5A-8E2C-0DAF338119EE} + {CA211D0B-4C2E-4AC8-AD48-FD5838EDC65E} = {52A32895-CD49-4F28-A507-5F7B2FD50CD7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9CBFB09D-7C56-44E7-9737-13FA2053795F} diff --git a/Directory.Build.props b/Directory.Build.props index 0343f933..ab7c86d4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,13 @@ + + + $(MSBuildThisFileDirectory)\.artifacts\obj\$(MSBuildProjectName)\ + $(MSBuildThisFileDirectory).artifacts\$(MSBuildProjectName)\ + Debug;Release false true @@ -14,7 +20,7 @@ 4.0.2.0 4.0.2 - ..\_Results + $(MSBuildThisFileDirectory).artifacts\.Nuget RSDN diff --git a/LICENSE b/LICENSE index 8fbbd9ab..d02d9bae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020 Russian Software Developer Network +Copyright (c) 2023 Russian Software Developer Network Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Pipelines/Appveyor.Tests.ps1 b/Pipelines/Appveyor.Tests.ps1 new file mode 100644 index 00000000..b0cc071d --- /dev/null +++ b/Pipelines/Appveyor.Tests.ps1 @@ -0,0 +1,54 @@ +<# + Feel my pain. Here's incomplete list of issues that prevents us just to use existing tooling: + * https://github.com/appveyor/ci/issues/1894 - root cause. Test results are overwritten + * https://github.com/nunit/nunit/issues/3790 - bonus issue: no support for legacy frameforks on dotnet test + * https://github.com/microsoft/vstest/issues/4355 - dotnet vstest does not emits TFM for the trx file + * https://github.com/microsoft/vstest/issues/880 - dotnet test merges test result for multitargeting test + * https://github.com/nunit/nunit/pull/2724 - PR for appveyor format support (abandoned) + * +#> + + +# Run .Net Framework tests using nunit3-console +## AppVeyor agent image uses PS6 and therefore does not support coalesce operator. +$configuration = ($env:CONFIGURATION, 'Debug' -ne $null)[0] +## We use nunit-console here as as dotnet test does not support legacy net frameworks +$testNetFwDlls = ls -r ".artifacts\*\$configuration\*.Tests.dll" | ? FullName -match '\\net\d+\\' ` | % FullName +$logFilePath = '.artifacts\nunit_netframework.xml' +nunit3-console $testNetFwDlls --result=$logFilePath + +## Update test report: add TFM to the assemply name +$matchPattern = 'name="(?''name''.*?\.dll)" fullname="(?''fullname''.*?\\(?''tfm''net[^\\]*)\\[^\\]*?\.dll)"' +$replacement = 'name="${name} (${tfm})" fullname="${fullname} (${tfm})"' +(cat $logFilePath) -Replace $matchPattern, $replacement | Out-File -Encoding UTF8 $logFilePath + + +# Run .Net Core tests +## Emits multiple test reports +dotnet test .\CodeJam.sln -p:NetCoreTests=true --no-build --no-restore ` + --results-directory '.\.artifacts\' ` + --logger 'trx;LogFilePrefix=nunit' + +## Update test reports: add TFM to the assemply name +$matchPattern1 = 'storage="(?''storage''.*?\\(?''tfm''net[^\\]*)\\[^\\]*?\.dll)"' +$replacement1 = 'storage="${storage} (${tfm})"' +$matchPattern2 = 'codeBase="(?''codeBase''.*?\\(?''tfm''net[^\\]*)\\[^\\]*?\.dll)"' +$replacement2 = 'codeBase="${codeBase} (${tfm})"' +$netCoreReports = ls '.artifacts\nunit_*.trx' | % FullName +$netCoreReports | ForEach-Object { + (cat $_) -Replace $matchPattern1, $replacement1 -Replace $matchPattern2, $replacement2 | Out-File -Encoding UTF8 $_ +} + + +# Upload files +$wc = New-Object 'System.Net.WebClient' +$testResults = @(ls '.artifacts\nunit_*.xml' | % FullName) +$testResults | ForEach-Object { + echo "UploadFile: https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID from $_" + $wc.UploadFile("https://ci.appveyor.com/api/testresults/nunit3/$env:APPVEYOR_JOB_ID", $_) +} +$testResults = ls '.artifacts\nunit_*.trx' | % FullName +$testResults | ForEach-Object { + echo "UploadFile: https://ci.appveyor.com/api/testresults/mstest/$env:APPVEYOR_JOB_ID from $_" + $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$env:APPVEYOR_JOB_ID", $_) +} \ No newline at end of file diff --git a/Pipelines/Pipelines.csproj b/Pipelines/Pipelines.csproj new file mode 100644 index 00000000..27aefbf4 --- /dev/null +++ b/Pipelines/Pipelines.csproj @@ -0,0 +1,10 @@ + + + + netstandard2.0 + + + + + + \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index cac49327..8c4b607d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,61 +1,13 @@ -configuration: Release -image: Visual Studio 2022 +image: Visual Studio 2022 +configuration: Release version: '4.0.0.{build}' -#environment: -# packageVersion: 3.0.0 -# perfTestsPackageVersion: 0.2.2 - -init: -- cmd: git config --global core.autocrlf true -#- ps: $env:buildVersion = "$env:packageVersion.$env:appveyor_build_number" -#- ps: $env:nugetVersion = "$env:packageVersion-alpha$env:appveyor_build_number" -#- ps: Update-AppveyorBuild -Version $env:buildVersion -# to troubleshoot via RDP: -#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -assembly_info: - patch: true - file: '**\AssemblyInfo.cs' - assembly_version: '{version}' - assembly_file_version: '{version}' - assembly_informational_version: '{version}' - -dotnet_csproj: - patch: true - file: 'Directory.Build.props' - version: '{version}' - package_version: '{version}' - nuget: account_feed: false project_feed: false -#build: -# project: CodeJam.sln -# publish_nuget: false -# verbosity: minimal - -before_build: -- cmd: nuget restore CodeJam.sln build_script: -- msbuild CodeJam.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Restore;Build /v:m - -#test: -# assemblies: -# only: -# - '**\*.Tests.dll' +- ps: dotnet build .\CodeJam.sln -p:Version=$env:APPVEYOR_BUILD_VERSION test_script: - - ps: .\Build\BuildScripts\CodeJam.AppVeyor.NUnit.Tests.ps1 - -artifacts: - - path: '_Results\*.nupkg' - -#after_build: -# - ps: Get-ChildItem .\_Results\*.nupkg | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } - -#on_finish: -# to troubleshoot via RDP: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - + - ps: .\Pipelines\Appveyor.Tests.ps1 \ No newline at end of file