From b343d870a260e3d38a132f9bb98833d02b6d68da Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Fri, 24 May 2024 20:15:31 -0700 Subject: [PATCH 1/8] Bump up to v2.8.2-pre --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index c050439..a76dbef 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.8.1", + "version": "2.8.2-pre.{height}", "nuGetPackageVersion": { "semVer": 2.0 }, From 970f77300e68df01dfb4c21e45b75bd6bbd07de8 Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Sat, 25 May 2024 15:43:56 -0700 Subject: [PATCH 2/8] Updated .gitignore --- .gitignore | 147 ++++++++++++++++++++++++++++++++++++------- tools/builder/common | 2 +- 2 files changed, 125 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index bcf5ae9..cc6f184 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,20 @@ -##### Copied from https://github.com/github/gitignore/blob/7792e50daeaa6c07460484704671d1dc9f0045a7/VisualStudio.gitignore +# NCrunch +*.ncrunchsolution +*.ncrunchsolution.user +*.ncrunchproject + +# Mono's local registry +mono + +##### Copied from https://github.com/github/gitignore/blob/7b22f8ab6c85b4ef1469d72a8ba96462e2a44853/VisualStudio.gitignore ## 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/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user *.userosscache @@ -14,6 +23,9 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -21,23 +33,31 @@ [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 cache/options directory +# 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 +# NUnit *.VisualState.xml TestResult.xml +nunit-*.xml # Build Results of an ATL Project [Dd]ebugPS/ @@ -51,16 +71,24 @@ BenchmarkDotNet.Artifacts/ project.lock.json project.fragment.lock.json artifacts/ -**/Properties/launchSettings.json +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c -*_i.h +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -70,7 +98,9 @@ artifacts/ *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -112,9 +142,6 @@ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# JustCode is a .NET coding add-in -.JustCode - # TeamCity is a build add-in _TeamCity* @@ -125,6 +152,11 @@ _TeamCity* .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 @@ -172,12 +204,14 @@ PublishScripts/ # NuGet Packages *.nupkg +# NuGet Symbol Packages +*.snupkg # The packages folder can be ignored because of Package Restore -**/packages/* +**/[Pp]ackages/* # except build/, which is used as an MSBuild target. -!**/packages/build/ +!**/[Pp]ackages/build/ # Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config +#!**/[Pp]ackages/repositories.config # NuGet v3's project.json files produces more ignorable files *.nuget.props *.nuget.targets @@ -196,12 +230,14 @@ 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/ +!?*.[Cc]ache/ # Others ClientBin/ @@ -214,6 +250,10 @@ ClientBin/ *.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/ @@ -228,6 +268,8 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak # SQL Server files *.mdf @@ -238,6 +280,10 @@ UpgradeLog*.htm *.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/ @@ -249,9 +295,6 @@ FakesAssemblies/ .ntvs_analysis.dat node_modules/ -# Typescript v1 declaration files -typings/ - # Visual Studio 6 build log *.plg @@ -261,6 +304,17 @@ typings/ # 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 @@ -276,12 +330,8 @@ paket-files/ # FAKE - F# Make .fake/ -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ +# CodeRush personal settings +.cr/personal # Python Tools for Visual Studio (PTVS) __pycache__/ @@ -304,4 +354,55 @@ __pycache__/ *.xsd.cs # OpenCover UI analysis results -OpenCover/ \ No newline at end of file +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/tools/builder/common b/tools/builder/common index e8305eb..d2bf983 160000 --- a/tools/builder/common +++ b/tools/builder/common @@ -1 +1 @@ -Subproject commit e8305ebba18fd42d26e6dff4beb7523d1acd2a6f +Subproject commit d2bf9839ff157691f512c6b716aa23a4208f852b From 78342f0f40ad06fae09dbc97ae16b7e0796171e7 Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Sat, 25 May 2024 15:47:37 -0700 Subject: [PATCH 3/8] Latest builder --- tools/builder/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/builder/common b/tools/builder/common index d2bf983..90dba1f 160000 --- a/tools/builder/common +++ b/tools/builder/common @@ -1 +1 @@ -Subproject commit d2bf9839ff157691f512c6b716aa23a4208f852b +Subproject commit 90dba1f5638a4f00d4978a73e23edde5b85061d9 From 3762114fe2da9ae3db1bc759d71f470870bdd1e4 Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Mon, 27 May 2024 15:13:31 -0700 Subject: [PATCH 4/8] Update README build table to Markdown --- README.md | 42 ++++++------------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 0ced043..e8839da 100644 --- a/README.md +++ b/README.md @@ -8,42 +8,12 @@ This project contains the Visual Studio runner for xUnit.net. It supports the bu ## Latest Builds - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StableLatest CIBuild status
v2 core framework
v3 core framework (alpha docs)N/A
xunit.analyzers
xunit.runner.visualstudio
+|   | Stable | Latest CI | Build status | +| ------ | ------ | --------- | ------------ | +| v2 core framework | [![](https://img.shields.io/nuget/v/xunit.svg?logo=nuget)](https://www.nuget.org/packages/xunit) | [![](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fxunit%2Fxunit%2Fshield%2Fxunit%2Flatest)](https://feedz.io/org/xunit/repository/xunit/packages/xunit) | [![](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fxunit%2Fxunit%2Fbadge%3Fref%3Dv2&label=build)](https://github.com/xunit/xunit/actions/workflows/push-v2.yaml) | +| v3 core framework ([alpha docs](https://xunit.net/docs/v3-alpha)) | N/A | [![](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fxunit%2Fxunit%2Fshield%2Fxunit.v3%2Flatest)](https://feedz.io/org/xunit/repository/xunit/packages/xunit.v3) | [![](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fxunit%2Fxunit%2Fbadge%3Fref%3Dmain&label=build)](https://github.com/xunit/xunit/actions/workflows/push-main.yaml) | +| xunit.analyzers | [![](https://img.shields.io/nuget/v/xunit.analyzers.svg?logo=nuget)](https://www.nuget.org/packages/xunit.analyzers) | [![](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fxunit%2Fxunit%2Fshield%2Fxunit.analyzers%2Flatest)](https://feedz.io/org/xunit/repository/xunit/packages/xunit.analyzers) | [![](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fxunit%2Fxunit.analyzers%2Fbadge%3Fref%3Dmain&label=build)](https://github.com/xunit/xunit.analyzers/actions/workflows/push-main.yaml) | +| xunit.runner.visualstudio | [![](https://img.shields.io/nuget/v/xunit.runner.visualstudio.svg?logo=nuget)](https://www.nuget.org/packages/xunit.analyzers) | [![](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fxunit%2Fxunit%2Fshield%2Fxunit.runner.visualstudio%2Flatest)](https://feedz.io/org/xunit/repository/xunit/packages/xunit.runner.visualstudio) | [![](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fxunit%2Fvisualstudio.xunit%2Fbadge%3Fref%3Dmain&label=build)](https://github.com/xunit/visualstudio.xunit/actions/workflows/push-main.yaml) | *For complete CI package lists, please visit the [feedz.io package search](https://feedz.io/org/xunit/repository/xunit/search). A free login is required.* From 07a1bdd6003fde57e9695fc8a758fbc3eb6d6153 Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Thu, 30 May 2024 12:50:23 -0700 Subject: [PATCH 5/8] Add launchSettings.json to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index cc6f184..118bf39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# Visual Studio +launchSettings.json + # NCrunch *.ncrunchsolution *.ncrunchsolution.user From a501f16081d8a6bd7c74af119c4c5d3f0cca4335 Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Wed, 5 Jun 2024 09:24:20 -0700 Subject: [PATCH 6/8] Updated .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 118bf39..ee0e410 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ launchSettings.json *.ncrunchproject # Mono's local registry -mono +.mono ##### Copied from https://github.com/github/gitignore/blob/7b22f8ab6c85b4ef1469d72a8ba96462e2a44853/VisualStudio.gitignore From e5e6fbacb2b5def1b5fe7df9e8dce27dec5332cf Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Fri, 14 Jun 2024 10:40:43 -0700 Subject: [PATCH 7/8] Move 2.x builds to the v2 branch --- .github/workflows/{push-main.yaml => push-v2.yaml} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename .github/workflows/{push-main.yaml => push-v2.yaml} (97%) diff --git a/.github/workflows/push-main.yaml b/.github/workflows/push-v2.yaml similarity index 97% rename from .github/workflows/push-main.yaml rename to .github/workflows/push-v2.yaml index 1c14801..09e6fe1 100644 --- a/.github/workflows/push-main.yaml +++ b/.github/workflows/push-v2.yaml @@ -1,9 +1,8 @@ -name: CI Build +name: "CI Build (v2)" on: push: branches: - - main - - 'rel/**' + - v2 workflow_dispatch: jobs: From 699d445a1aab46a014bce946edc4995b6b46accf Mon Sep 17 00:00:00 2001 From: Brad Wilson Date: Sun, 7 Jul 2024 13:31:02 -0700 Subject: [PATCH 8/8] v2.8.2 --- Versions.props | 4 ++-- version.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Versions.props b/Versions.props index 373103b..0eafe39 100644 --- a/Versions.props +++ b/Versions.props @@ -8,8 +8,8 @@ 3.6.133 5.1.0 1.0.0-alpha.160 - 1.14.0 - 2.8.1 + 1.15.0 + 2.9.0 diff --git a/version.json b/version.json index a76dbef..23bdf1e 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.8.2-pre.{height}", + "version": "2.8.2", "nuGetPackageVersion": { "semVer": 2.0 },