From 58b5bd6475e086d1a8408f3da7f3e7e6e4ac2a35 Mon Sep 17 00:00:00 2001 From: Bacskay Viktor Date: Thu, 3 Mar 2022 09:43:40 +0100 Subject: [PATCH 1/4] - Move AppInstallerTemplateItem to editor folder --- CHANGELOG.md | 3 +++ MainProject/Directory.Build.props | 2 +- .../Assets/Injecter.Hosting.Unity/Editor.meta | 8 ++++++++ .../{ => Editor}/AppInstallerTemplateItem.cs | 2 +- .../AppInstallerTemplateItem.cs.meta | 0 .../Editor/Injecter.Hosting.Unity.Editor.asmdef | 16 ++++++++++++++++ .../Injecter.Hosting.Unity.Editor.asmdef.meta | 7 +++++++ .../Assets/Injecter.Hosting.Unity/package.json | 4 ++-- .../Assets/Injecter.Unity/package.json | 2 +- 9 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor.meta rename UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/{ => Editor}/AppInstallerTemplateItem.cs (99%) rename UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/{ => Editor}/AppInstallerTemplateItem.cs.meta (100%) create mode 100644 UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef create mode 100644 UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef.meta diff --git a/CHANGELOG.md b/CHANGELOG.md index 5860325..4fefa72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 8.0.1 +- Move AppInstallerTemplateItem to editor folder + # 8.0.0 - Unity lifetime clears scopes diff --git a/MainProject/Directory.Build.props b/MainProject/Directory.Build.props index ea3345a..530234f 100644 --- a/MainProject/Directory.Build.props +++ b/MainProject/Directory.Build.props @@ -3,7 +3,7 @@ 9.0 enable - 8.0.0 + 8.0.1 $(CurrentVersion) $(CurrentVersion) diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor.meta b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor.meta new file mode 100644 index 0000000..024177f --- /dev/null +++ b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50912b54988205d4ba8fc93d6f37f831 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/AppInstallerTemplateItem.cs b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/AppInstallerTemplateItem.cs similarity index 99% rename from UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/AppInstallerTemplateItem.cs rename to UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/AppInstallerTemplateItem.cs index bf3283f..ef654bc 100644 --- a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/AppInstallerTemplateItem.cs +++ b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/AppInstallerTemplateItem.cs @@ -1,7 +1,7 @@ #nullable enable using UnityEditor; -namespace Injecter.Hosting.Unity +namespace Injecter.Hosting.Unity.Editor { /// /// Buttons that create commonly used classes diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/AppInstallerTemplateItem.cs.meta b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/AppInstallerTemplateItem.cs.meta similarity index 100% rename from UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/AppInstallerTemplateItem.cs.meta rename to UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/AppInstallerTemplateItem.cs.meta diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef new file mode 100644 index 0000000..86913e2 --- /dev/null +++ b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef @@ -0,0 +1,16 @@ +{ + "name": "Injecter.Hosting.Unity.Editor", + "rootNamespace": "", + "references": [], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef.meta b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef.meta new file mode 100644 index 0000000..5dfb319 --- /dev/null +++ b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/Editor/Injecter.Hosting.Unity.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b8903f51d84b9248bd640d922c3dcc9 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json index ebf39df..e993201 100644 --- a/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json +++ b/UnityProject/Injecter.Unity/Assets/Injecter.Hosting.Unity/package.json @@ -1,6 +1,6 @@ { "name": "com.injecter.hosting.unity", - "version": "8.0.0", + "version": "8.0.1", "displayName": "Injecter.Hosting.Unity", "license": "MIT", "licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md", @@ -13,6 +13,6 @@ "url": "https://github.com/KuraiAndras/Injecter" }, "dependencies": { - "com.injecter.unity": "8.0.0" + "com.injecter.unity": "8.0.1" } } diff --git a/UnityProject/Injecter.Unity/Assets/Injecter.Unity/package.json b/UnityProject/Injecter.Unity/Assets/Injecter.Unity/package.json index 2a42cb5..b817d66 100644 --- a/UnityProject/Injecter.Unity/Assets/Injecter.Unity/package.json +++ b/UnityProject/Injecter.Unity/Assets/Injecter.Unity/package.json @@ -1,6 +1,6 @@ { "name": "com.injecter.unity", - "version": "8.0.0", + "version": "8.0.1", "displayName": "Injecter.Unity", "license": "MIT", "licensesUrl": "https://github.com/KuraiAndras/Injecter/blob/master/LICENSE.md", From b7ca261899a585fe0235025f1ad673149b2775f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kurai=20Andr=C3=A1s?= Date: Thu, 3 Mar 2022 09:53:30 +0100 Subject: [PATCH 2/4] update github actions --- .github/workflows/run-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8ca86c1..994d950 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,18 +14,18 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3.0.0 with: fetch-depth: 0 - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v2.0.0 - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1.1 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v3.0.0 with: java-version: 17 From 7bfc01bad3e74b9f34c6dd0ef92bfc5f44db3d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kurai=20Andr=C3=A1s?= Date: Thu, 3 Mar 2022 09:56:52 +0100 Subject: [PATCH 3/4] update other actions --- .github/workflows/nukeeper.yml | 6 +++--- .github/workflows/publis-to-gh-pages.yml | 8 ++++---- .github/workflows/publish.yml | 6 +++--- .github/workflows/run-tests.yml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nukeeper.yml b/.github/workflows/nukeeper.yml index 43785a8..28d33e1 100644 --- a/.github/workflows/nukeeper.yml +++ b/.github/workflows/nukeeper.yml @@ -11,15 +11,15 @@ jobs: name: Update dependencies steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3.0.0 with: ref: develop - name: Setup Current .NET SDK - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v2.0.0 - name: Setup Tools .NET SDK - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v2.0.0 with: dotnet-version: '3.1.x' diff --git a/.github/workflows/publis-to-gh-pages.yml b/.github/workflows/publis-to-gh-pages.yml index ca7f56e..2095569 100644 --- a/.github/workflows/publis-to-gh-pages.yml +++ b/.github/workflows/publis-to-gh-pages.yml @@ -11,20 +11,20 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3.0.0 - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v2.0.0 - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: Build DocFX shell: pwsh run: ./build.ps1 BuildDocs --is-ci - name: Deploy to GitHub Pages - uses: crazy-max/ghaction-github-pages@v2.2.0 + uses: crazy-max/ghaction-github-pages@v2.6.0 with: target_branch: gh-pages build_dir: Documentation/_site diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 48fc127..efe8721 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,13 +11,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3.0.0 - name: Setup .NET Core SDK - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v2.0.0 - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v1.1 - name: Publish env: diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 994d950..03be65f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-dotnet@v2.0.0 - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.1.1 + uses: microsoft/setup-msbuild@v1.1 - name: Set up JDK uses: actions/setup-java@v3.0.0 From e508e7b39977d6c89faaa356b75353736e07e5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kurai=20Andr=C3=A1s?= Date: Thu, 3 Mar 2022 10:01:40 +0100 Subject: [PATCH 4/4] add jdk distribution --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 03be65f..4c63095 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -28,6 +28,7 @@ jobs: uses: actions/setup-java@v3.0.0 with: java-version: 17 + distribution: microsoft - name: Test shell: pwsh