Skip to content

Commit b1a236f

Browse files
authored
Merge pull request LykosAI#925 from ionite34/softsteer
:softsteer:
2 parents 52032d3 + 2e54294 commit b1a236f

File tree

333 files changed

+8492
-2331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+8492
-2331
lines changed

.config/dotnet-tools.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
"dotnet-csharpier"
2323
],
2424
"rollForward": false
25+
},
26+
"dotnet-script": {
27+
"version": "1.6.0",
28+
"commands": [
29+
"dotnet-script"
30+
],
31+
"rollForward": false
2532
}
2633
}
27-
}
34+
}

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up .NET
2222
uses: actions/setup-dotnet@v3
2323
with:
24-
dotnet-version: '8.0.x'
24+
dotnet-version: '9.0.x'
2525

2626
- name: Install dependencies
2727
run: dotnet restore

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ jobs:
7676
echo "Using version ${{ github.event.inputs.version }}"
7777
echo "RELEASE_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
7878
79-
- name: Set up .NET 8
79+
- name: Set up .NET 9
8080
uses: actions/setup-dotnet@v3
8181
with:
82-
dotnet-version: '8.0.x'
82+
dotnet-version: '9.0.x'
8383

8484
- name: Install PupNet
8585
run: |
@@ -144,10 +144,10 @@ jobs:
144144
echo "Using version ${{ github.event.inputs.version }}"
145145
echo "RELEASE_VERSION=${{ github.event.inputs.version }}" >> $env:GITHUB_ENV
146146
147-
- name: Set up .NET 8
147+
- name: Set up .NET 9
148148
uses: actions/setup-dotnet@v3
149149
with:
150-
dotnet-version: '8.0.x'
150+
dotnet-version: '9.0.x'
151151

152152
- name: Install dependencies
153153
run: dotnet restore
@@ -203,10 +203,10 @@ jobs:
203203
echo "Using version ${{ github.event.inputs.version }}"
204204
echo "RELEASE_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
205205
206-
- name: Set up .NET 8
206+
- name: Set up .NET 9
207207
uses: actions/setup-dotnet@v3
208208
with:
209-
dotnet-version: '8.0.x'
209+
dotnet-version: '9.0.x'
210210

211211
- name: Install dependencies
212212
run: dotnet restore -p:PublishReadyToRun=true

.github/workflows/test-ui.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up .NET
1919
uses: actions/setup-dotnet@v3
2020
with:
21-
dotnet-version: '8.0.x'
21+
dotnet-version: '9.0.x'
2222

2323
- name: Install dependencies
2424
run: dotnet restore

Avalonia.Gif/Avalonia.Gif.csproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\Runtimes.Default.props" />
3+
24
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
45
<LangVersion>latest</LangVersion>
5-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64;osx-arm64</RuntimeIdentifiers>
7-
<ImplicitUsings>enable</ImplicitUsings>
8-
<Nullable>enable</Nullable>
6+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
97
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
108
<EnableWindowsTargeting>true</EnableWindowsTargeting>
119
</PropertyGroup>
@@ -16,9 +14,9 @@
1614
</PropertyGroup>
1715

1816
<ItemGroup>
19-
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
20-
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.4.1" />
21-
<PackageReference Include="DotNet.Bundle" Version="0.9.13" />
17+
<PackageReference Include="Avalonia" />
18+
<PackageReference Include="SkiaSharp" />
19+
<PackageReference Include="DotNet.Bundle" />
2220
</ItemGroup>
2321

2422
</Project>

CHANGELOG.md

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,91 @@ All notable changes to Stability Matrix will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
77

8+
## v2.13.0-pre.2
9+
### Added
10+
- Added new package - [ComfyUI-Zluda](https://github.com/patientx/ComfyUI-Zluda) - for AMD GPU users on Windows
11+
- Added OpenModelDB tab to the Model Browser
12+
13+
## v2.13.0-pre.1
14+
### Added
15+
- Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
16+
- Added file sizes to the Checkpoint Manager tab
17+
- Added more formatting options for Inference output filenames - thanks to @yansigit!
18+
- Added the Discrete Model Sampling addon for Inference samplers, allows selecting different sampling methods, such as v_prediction, lcm, or x0, and optionally adjusts the model’s noise reduction strategy with the zero-shot noise ratio (ZSNR) toggle.
19+
- Added Default GPU override in Settings -> System Settings -> Default GPU
20+
- Added the ability to copy more generation parameters from the Inference gallery context menu
21+
### Changed
22+
- Improved Packages Page grid layout to dynamically stretch to fill available space
23+
- New file format and key derivation for protecting locally encrypted secrets (i.e. Civit / Lykos accounts) that is no longer dependent on the OS Version. This should prevent system updates from clearing account logins.
24+
- (Internal) Updated to .NET 9 Runtime and Avalonia 11.2.2 for performance improvements, lower memory usage, and bug fixes
25+
### Fixed
26+
- Improved startup performance and resource usage with optimizations to hardware lookups. Moved reflection usages in dependency injection to source generation.
27+
- Fixed a typo in the Japanese translation - thanks to @mattyatea!
28+
- Fixed missing package thumbnails due to moved or inaccessible urls
29+
- Fixed an issue with ComfyUI-Impact-Subpack not being installed when using FaceDetailer in Inference
30+
- Fixed GGUF models not showing in Inference without the GGUF extension installed (this means it will now properly prompt you to install the extension as well)
31+
### Supporters
32+
#### Visionaries
33+
- Huge thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your unwavering support is very much appreciated!
34+
35+
## v2.13.0-dev.3
36+
### Added
37+
- Added support for SD3.5 in Inference
38+
- Added CLIP_G to HuggingFace model browser
39+
- Added search bar to the Installed Workflows tab
40+
- Added "Search with Google" and "Search with ChatGPT" to the package console output & install progress console output context menus
41+
- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
42+
### Changed
43+
- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector
44+
- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
45+
- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
46+
- Updated Civitai model descriptions to properly render the interactive elements
47+
- Updated Russian translations thanks to @vanja-san
48+
- Updated Simplified Chinese translations thanks to @QL-boy
49+
- (Internal) Updated to Avalonia 11.2.0
50+
### Fixed
51+
- Fixed some instances of Civitai model browser not loading new results
52+
- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
53+
- Fixed crash when clicking "Remind me Later" on the update dialog
54+
- Fixed some cases of crashing when GitHub API rate limits are exceeded
55+
- Fixed Git missing from env vars when running SwarmUI
56+
### Supporters
57+
#### Visionaries
58+
- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
59+
60+
## v2.13.0-dev.2
61+
### Added
62+
- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
63+
- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
64+
- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
65+
- Added "Search by Creator" command to Civitai browser context menu
66+
- Added Beta scheduler to the scheduler selector in Inference
67+
- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
68+
- Added max concurrent downloads option & download queueing for most downloads
69+
### Changed
70+
- (Internal) Updated to Avalonia 11.1.4
71+
- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
72+
- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
73+
### Fixed
74+
- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
75+
- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
76+
- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
77+
- Fixed minimize button not working on macOS
78+
- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
79+
- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
80+
### Supporters
81+
#### Visionaries
82+
- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
83+
84+
## v2.13.0-dev.1
85+
### Added
86+
- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
87+
- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
88+
- Added InvokeAI model sharing option
89+
### Supporters
90+
#### Visionaries
91+
- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
92+
893
## v2.12.5
994
### Fixed
1095
- Fixed an issue with ComfyUI-Impact-Subpack not being installed when using FaceDetailer in Inference
@@ -59,6 +144,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
59144
- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
60145
- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
61146
- Fixed minimize button not working on macOS
147+
62148
### Supporters
63149
#### Visionaries
64150
- We extend our heartfelt appreciation to our dedicated Visionary-tier Patreon supporter, **Waterclouds**. Your ongoing support is invaluable!

ConditionalSymbols.props

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
<PropertyGroup Label="Compile Options">
3+
<!-- true to include all conditional paths / attributes, mainly for testing -->
4+
<SM_IncludeAllConditionals>false</SM_IncludeAllConditionals>
5+
<!-- Mode for ServiceProvider registrations: CodeGeneration, Reflection -->
6+
<SM_RegisterServiceMode>CodeGeneration</SM_RegisterServiceMode>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition="'$(SM_IncludeAllConditionals)' == 'true'">
10+
<!-- REGISTER_SERVICE_USAGES: Include Injectio attributes -->
11+
<DefineConstants>$(DefineConstants);REGISTER_SERVICE_USAGES</DefineConstants>
12+
</PropertyGroup>
13+
14+
<PropertyGroup Label="RegisterServiceMode Definitions">
15+
<DefineConstants Condition="'$(SM_RegisterServiceMode)' == 'Reflection'">
16+
$(DefineConstants);REGISTER_SERVICE_REFLECTION;REGISTER_SERVICE_USAGES
17+
</DefineConstants>
18+
</PropertyGroup>
19+
</Project>

Directory.Build.props

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
<Project>
22
<PropertyGroup>
3-
<AvaloniaVersion>11.1.4</AvaloniaVersion>
3+
<TargetFramework>net9.0</TargetFramework>
4+
<Nullable>enable</Nullable>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
7+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<AvaloniaVersion>11.2.2</AvaloniaVersion>
12+
</PropertyGroup>
13+
14+
<PropertyGroup>
15+
<!-- AVLN3001: Not using the default Avalonia runtime loader so this doesn't matter -->
16+
<NoWarn>$(NoWarn);AVLN3001</NoWarn>
417
</PropertyGroup>
518

619
<PropertyGroup>

0 commit comments

Comments
 (0)