mirror of
https://github.com/Artemis-RGB/Artemis
synced 2025-12-12 13:28:33 +00:00
Merge branch 'development'
This commit is contained in:
commit
d48d0acb5b
2
.github/workflows/docfx.yml
vendored
2
.github/workflows/docfx.yml
vendored
@ -16,7 +16,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v2
|
||||
with:
|
||||
dotnet-version: "7.0.x"
|
||||
dotnet-version: "8.0.x"
|
||||
- name: Setup DocFX
|
||||
run: dotnet tool update -g docfx
|
||||
- name: Build Core
|
||||
|
||||
2
.github/workflows/master.yml
vendored
2
.github/workflows/master.yml
vendored
@ -60,7 +60,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v2
|
||||
with:
|
||||
dotnet-version: '7.0.x'
|
||||
dotnet-version: '8.0.x'
|
||||
- name: Publish Artemis
|
||||
run: dotnet publish --configuration Release -p:Version=${{ needs.version.outputs.version-number }} --runtime ${{ matrix.rid }} --output build/${{ matrix.rid }} --self-contained Artemis/src/Artemis.UI.${{ matrix.csproj }}/Artemis.UI.${{ matrix.csproj }}.csproj
|
||||
- name: Publish Plugins
|
||||
|
||||
2
.github/workflows/nuget.yml
vendored
2
.github/workflows/nuget.yml
vendored
@ -37,7 +37,7 @@ jobs:
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v2
|
||||
with:
|
||||
dotnet-version: '7.0.x'
|
||||
dotnet-version: '8.0.x'
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Pack Artemis.Core
|
||||
|
||||
@ -93,6 +93,14 @@ public partial class ImageSubmissionViewModel : ValidatableViewModelBase
|
||||
Name = vm.Name;
|
||||
Description = vm.Description;
|
||||
|
||||
// TODO: Just get rid of this stupid mechanism
|
||||
if (ImageUploadRequest != null)
|
||||
{
|
||||
if (Name != null)
|
||||
ImageUploadRequest.Name = Name;
|
||||
ImageUploadRequest.Description = Description;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user