From 559a141cfb3945174153793f1405dfba7e9255f7 Mon Sep 17 00:00:00 2001 From: Digitalroot Date: Tue, 14 May 2024 23:00:02 -0700 Subject: [PATCH] Updated --- .github/workflows/discord.yml | 16 ---------------- .github/workflows/nuget.release.yml | 2 ++ src/Digitalroot.Valheim.Common.Names.sln | 3 ++- .../packages.lock.json | 14 -------------- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 .github/workflows/discord.yml diff --git a/.github/workflows/discord.yml b/.github/workflows/discord.yml deleted file mode 100644 index b2ed5b9..0000000 --- a/.github/workflows/discord.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Discord Webhook - -on: - push: - branches: [ "main" ] # Default release branch - paths: - - 'src/**' - - '.github/workflows/**' - -jobs: - discord: - uses: Digitalroot-Valheim/.github/.github/workflows/discord.yml@main - with: - repo_name: ${{ github.event.repository.name }} - secrets: - webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} diff --git a/.github/workflows/nuget.release.yml b/.github/workflows/nuget.release.yml index 5989d8a..44ec447 100644 --- a/.github/workflows/nuget.release.yml +++ b/.github/workflows/nuget.release.yml @@ -21,6 +21,8 @@ jobs: secrets: aws-access-key-id: ${{ secrets.NUGET_S3_REPO_KEY_ID }} aws-secret-access-key: ${{ secrets.NUGET_S3_REPO_KEY_SECRET }} + webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} + with: sln-file-name: Digitalroot.Valheim.Common.Names proj-file-name: Digitalroot.Valheim.Common.Names diff --git a/src/Digitalroot.Valheim.Common.Names.sln b/src/Digitalroot.Valheim.Common.Names.sln index c09e230..d51af2b 100644 --- a/src/Digitalroot.Valheim.Common.Names.sln +++ b/src/Digitalroot.Valheim.Common.Names.sln @@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{E64D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{1960DCD1-3C51-48FF-BFF8-5FE4C3CBABB2}" ProjectSection(SolutionItems) = preProject + ..\.github\workflows\nuget.autoupdate.yml = ..\.github\workflows\nuget.autoupdate.yml ..\.github\workflows\nuget.release.yml = ..\.github\workflows\nuget.release.yml EndProjectSection EndProject @@ -24,7 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{FF80B556-8 ..\docs\README.md = ..\docs\README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{34FFC804-CA5E-4AAB-8E44-9ECDF5BF9595}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{34FFC804-CA5E-4AAB-8E44-9ECDF5BF9595}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Digitalroot.Valheim.Common.Names/packages.lock.json b/src/Digitalroot.Valheim.Common.Names/packages.lock.json index 69760f5..f06274f 100644 --- a/src/Digitalroot.Valheim.Common.Names/packages.lock.json +++ b/src/Digitalroot.Valheim.Common.Names/packages.lock.json @@ -17,15 +17,6 @@ "Digitalroot.Valheim.Common.Log": "1.1.52" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" - } - }, "Digitalroot.References.Unity": { "type": "Transitive", "resolved": "2022.3.17", @@ -52,11 +43,6 @@ "type": "Transitive", "resolved": "1.2.0", "contentHash": "jcZROJ28bmrZx/RaFHcTlSy3x4SmSsMolJiKoluFFrE7oMiXUnYx1K+SJeHJhow05W0Rg9oi9HEyZWwdYSV3cw==" - }, - "Microsoft.NETFramework.ReferenceAssemblies.net48": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" } } }