Merge pull request #78 from KuraiAndras/develop

7.0.0

Author: KuraiAndras

.github/workflows/nukeeper.yml

@@ -28,4 +28,4 @@ jobs:
         env:
           NUKEEPER_TOKEN: ${{secrets.NUKEEPER_TOKEN}}
         run: |
-          ./build.ps1 UpdateNuGetPackages --nukeeper-token $env:NUKEEPER_TOKEN
+          ./build.ps1 UpdateNuGetPackages --is-ci --nukeeper-token $env:NUKEEPER_TOKEN

.github/workflows/publis-to-gh-pages.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Build DocFX
         shell: pwsh
-        run: ./build.ps1 BuildDocs
+        run: ./build.ps1 BuildDocs --is-ci
 
       - name: Deploy to GitHub Pages
         uses: crazy-max/ghaction-github-pages@v2.2.0

.github/workflows/publish.yml

@@ -25,5 +25,6 @@ jobs:
         shell: pwsh
         run: |
           ./build.ps1 PushToNuGet `
+          --is-ci `
           --nuget-api-key $env:NUGET_API_KEY `
-          --configuration Release `
+          --configuration Release

.github/workflows/run-tests.yml

@@ -36,6 +36,7 @@ jobs:
           SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
         run: |
           ./build.ps1 RunSonar `
+          --is-ci `
           --configuration Release `
           --sonar-host-url "https://sonarcloud.io" `
           --sonar-project-key "KuraiAndras_Injecter" `

.nuke/build.schema.json

@@ -42,6 +42,10 @@
             "VSCode"
           ]
         },
+        "IsCi": {
+          "type": "boolean",
+          "description": "Are we running inside a CI job?"
+        },
         "NoLogo": {
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 7.0.0
+- Add `MonoBehaviourInjected` and `MonoBehaviourScoped`
+- Renamed classes: \*MonoBehavior\* -> \*MonoBehavio**u**r\*
+- InjectedMonoBehavior now removes Scope from the store during `OnDestroy`
+- ScopeStore is now generic
+- Update dependencies
+- Update minimum Unity version to `2020.3`
+- Update to .NET 6 where not breaking
+
 # 6.1.2
 - `UseUnity` requires all parameters specified
 

Injecter.Build/Build.cs

@@ -22,6 +22,9 @@ sealed partial class Build : NukeBuild
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
     readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
+    [Parameter("Are we running inside a CI job?")]
+    readonly bool IsCi = false;
+
     [Solution] readonly Solution Solution;
 
     Lazy<ImmutableArray<Project>> TestProjects => new(() =>

Injecter.Build/Injecter.Build.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <IsPackable>false</IsPackable>
@@ -14,12 +14,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="5.3.0" />
+    <PackageReference Include="Nuke.Common" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageDownload Include="docfx.console" Version="[2.58.9]" />
-    <PackageDownload Include="dotnet-sonarscanner" Version="[5.4.0]" />
+    <PackageDownload Include="docfx.console" Version="[2.59.0]" />
+    <PackageDownload Include="dotnet-sonarscanner" Version="[5.5.3]" />
     <PackageDownload Include="NuGet.CommandLine" Version="[6.0.0]" />
     <PackageDownload Include="nukeeper" Version="[0.35.0]" />
   </ItemGroup>

Injecter.Build/Sonar.cs

@@ -3,7 +3,6 @@
 using Nuke.Common.Tools.SonarScanner;
 using static Nuke.Common.Tools.SonarScanner.SonarScannerTasks;
 
-
 sealed partial class Build
 {
     [Parameter] readonly string SonarProjectKey = string.Empty;
@@ -13,6 +12,7 @@ sealed partial class Build
 
     Target SonarBegin => _ => _
         .Before(Restore)
+        .OnlyWhenDynamic(() => IsCi)
         .Requires(() => SonarProjectKey)
         .Requires(() => SonarToken)
         .Requires(() => SonarHostUrl)
@@ -27,6 +27,7 @@ sealed partial class Build
             .SetCoverageExclusions("**/*Samples*/**")));
 
     Target SonarEnd => _ => _
+        .OnlyWhenDynamic(() => IsCi)
         .DependsOn(SonarBegin)
         .DependsOn(Test)
         .Executes(() => SonarScannerEnd(s => s
@@ -35,6 +36,7 @@ sealed partial class Build
 
     // ReSharper disable once UnusedMember.Local
     Target RunSonar => _ => _
+        .OnlyWhenDynamic(() => IsCi)
         .DependsOn(SonarEnd)
         .Executes(() => { });
 }

Injecter.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29926.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "X", "X", "{A6121CE2-43D9-414C-A432-C6313F951EBC}"
 	ProjectSection(SolutionItems) = preProject