From 37ff55b4a026c3dcc87a469a56c2dc65ad9a01ae Mon Sep 17 00:00:00 2001 From: Kyle Dodson Date: Sun, 5 Feb 2023 09:22:15 -0800 Subject: [PATCH 1/2] Update project dependencies --- .github/workflows/continuous-integration.yml | 14 +- .gitignore | 214 ++++++++++++------ OrleansTestKit.sln | 2 +- global.json | 2 +- src/OrleansTestKit/OrleansTestKit.csproj | 2 +- .../OrleansTestKit.Tests.csproj | 20 +- 6 files changed, 159 insertions(+), 95 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index ec6d8ce..1055f8b 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -29,10 +29,10 @@ jobs: name: Packages path: artifacts/Release/ # TODO: Need to create CODECOV_TOKEN secret. - - name: Upload Code Coverage Results - env: - CI: "true" - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - run: | - dotnet tool restore --verbosity minimal - dotnet codecov --dump --file test/OrleansTestKit.Tests/coverage.opencover.xml --required + # - name: Upload Code Coverage Results + # env: + # CI: "true" + # CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + # run: | + # dotnet tool restore --verbosity minimal + # dotnet codecov --dump --file test/OrleansTestKit.Tests/coverage.opencover.xml --required diff --git a/.gitignore b/.gitignore index fdc280b..eca7ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,82 @@ +## Linux.gitignore +## https://github.com/github/gitignore + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +## macOS.gitignore +## https://github.com/github/gitignore + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +## Windows.gitignore +## https://github.com/github/gitignore + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + ## JetBrains.gitignore ## https://github.com/github/gitignore -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff @@ -11,6 +86,9 @@ .idea/**/dictionaries .idea/**/shelf +# AWS User-specific +.idea/**/aws.xml + # Generated files .idea/**/contentModel.xml @@ -31,6 +109,9 @@ # When using Gradle or Maven with auto-import, you should exclude module files, # since they will be recreated, and may cause churn. Uncomment if using # auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml # .idea/modules.xml # .idea/*.iml # .idea/modules @@ -58,6 +139,9 @@ atlassian-ide-plugin.xml # Cursive Clojure plugin .idea/replstate.xml +# SonarLint plugin +.idea/sonarlint/ + # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml crashlytics.properties @@ -70,61 +154,13 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser -## Linux.gitignore -## https://github.com/github/gitignore - -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -## macOS.gitignore -## https://github.com/github/gitignore - -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - ## VisualStudio.gitignore ## https://github.com/github/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 @@ -146,12 +182,14 @@ mono_crash.* [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/ @@ -183,6 +221,9 @@ project.lock.json project.fragment.lock.json artifacts/ +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + # StyleCop StyleCopReport.xml @@ -208,6 +249,7 @@ StyleCopReport.xml *.tmp_proj *_wpftmp.csproj *.log +*.tlog *.vspscc *.vssscc .builds @@ -249,9 +291,6 @@ _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user -# JustCode is a .NET coding add-in -.JustCode - # TeamCity is a build add-in _TeamCity* @@ -262,6 +301,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 @@ -409,6 +453,17 @@ node_modules/ # 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 @@ -465,45 +520,54 @@ ASALocalRun/ # 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/ -## VisualStudioCode.gitignore -## https://github.com/github/gitignore +# 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 -## Windows.gitignore -## https://github.com/github/gitignore - -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini +# Local History for Visual Studio Code +.history/ -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files +# Windows Installer files from build outputs *.cab *.msi *.msix *.msm *.msp -# Windows shortcuts -*.lnk +# JetBrains Rider +*.sln.iml + +## VisualStudioCode.gitignore +## https://github.com/github/gitignore + +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix diff --git a/OrleansTestKit.sln b/OrleansTestKit.sln index a26be62..70cea3d 100644 --- a/OrleansTestKit.sln +++ b/OrleansTestKit.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.0.32014.148 +VisualStudioVersion = 17.4.33213.308 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{54C04CF7-7044-46E0-BC24-2A992F028557}" EndProject diff --git a/global.json b/global.json index d35cc5e..5383192 100644 --- a/global.json +++ b/global.json @@ -2,6 +2,6 @@ "sdk": { "allowPrerelease": false, "rollForward": "latestFeature", - "version": "5.0.400" + "version": "6.0.405" } } diff --git a/src/OrleansTestKit/OrleansTestKit.csproj b/src/OrleansTestKit/OrleansTestKit.csproj index 112e449..548a5da 100644 --- a/src/OrleansTestKit/OrleansTestKit.csproj +++ b/src/OrleansTestKit/OrleansTestKit.csproj @@ -3,7 +3,7 @@ dsarfati,seniorquico - Copyright © 2017-2021 Daniel Sarfati + Copyright © 2017-2021 Daniel Sarfati, 2021-2023 Kyle Dodson true true A unit test toolkit for Microsoft Orleans that does not require a real silo. Instead, tests are run with a mock silo. diff --git a/test/OrleansTestKit.Tests/OrleansTestKit.Tests.csproj b/test/OrleansTestKit.Tests/OrleansTestKit.Tests.csproj index 574b608..c85cf8a 100644 --- a/test/OrleansTestKit.Tests/OrleansTestKit.Tests.csproj +++ b/test/OrleansTestKit.Tests/OrleansTestKit.Tests.csproj @@ -8,22 +8,22 @@ true latest Orleans.TestKit.Tests - net5.0 + net6.0 - + all runtime; build; native; contentfiles; analyzers - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers From 251b2869b7aef255a476e56a2b22569d7fdf5ef5 Mon Sep 17 00:00:00 2001 From: Kyle Dodson Date: Sun, 5 Feb 2023 09:33:00 -0800 Subject: [PATCH 2/2] Bump NuGet package version --- src/OrleansTestKit/OrleansTestKit.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrleansTestKit/OrleansTestKit.csproj b/src/OrleansTestKit/OrleansTestKit.csproj index 548a5da..4018eb4 100644 --- a/src/OrleansTestKit/OrleansTestKit.csproj +++ b/src/OrleansTestKit/OrleansTestKit.csproj @@ -15,7 +15,7 @@ Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET Test Testing true snupkg - 3.1.8 + 3.1.9