DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-11 11:26:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development' into feature/visual-scripting

Browse Source
This commit is contained in:
Robert committed 2022-01-02 21:57:16 +01:00
2 parents 8f990f8f36 ddcb2cfcdb
commit 9da3e9cfb1
17 files changed
+8992 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

README.md
+4 -9
View File
@@ -18,20 +18,15 @@ A full list of supported devices can be found on the wiki [here](https://wiki.ar
#### Want to build? Follow these instructions
1. Create a central folder like ```C:\Repos```
2. Clone RGB.NET's [development branch](https://github.com/DarthAffe/RGB.NET/tree/Development) into ```<central folder>\RGB.NET```
3. Clone Artemis into ```<central folder>\Artemis```
4. Clone Artemis.Plugins [master branch](https://github.com/Artemis-RGB/Artemis.Plugins/tree/master) into ```<central folder>\Artemis.Plugins```
5. Open ```<central folder>\RGB.NET\RGB.NET.sln``` and build with the default config
6. Open ```<central folder>\Artemis\src\Artemis.sln``` and build as Debug
7. Open ```<central folder>\Artemis.Plugins\src\Artemis.Plugins.sln``` and build as Debug
8. Restore Nuget packages
2. Clone Artemis into ```<central folder>\Artemis```
3. Clone Artemis.Plugins [master branch](https://github.com/Artemis-RGB/Artemis.Plugins/tree/master) into ```<central folder>\Artemis.Plugins```
4. Open ```<central folder>\Artemis\src\Artemis.sln``` and build as Debug
5. Open ```<central folder>\Artemis.Plugins\src\Artemis.Plugins.sln``` and build as Debug
##### Alternatively in PowerShell
```
git clone https://github.com/DarthAffe/RGB.NET -b Development RGB.NET
git clone https://github.com/Artemis-RGB/Artemis Artemis
git clone https://github.com/Artemis-RGB/Artemis.Plugins Artemis.Plugins
dotnet build .\RGB.NET\RGB.NET.sln
dotnet build .\Artemis\src\Artemis.sln
dotnet build .\Artemis.Plugins\src\Artemis.Plugins.sln
```
azure-pipelines-pr.yml
-15
View File
@@ -10,11 +10,6 @@ pr:
resources:
repositories:
- repository: RGBNET
type: github
endpoint: github.com_SpoinkyNL
name: DarthAffe/RGB.NET
ref: Development
- repository: Plugins
type: github
endpoint: github.com_SpoinkyNL
@@ -26,7 +21,6 @@ pool:
variables:
artemisSolution: '**/Artemis.sln'
rgbSolution: '**/RGB.NET.sln'
pluginProjects: '**/Artemis.Plugins.*.csproj'
BuildId: $(Build.BuildId)
BuildNumber: $(Build.BuildNumber)
@@ -34,20 +28,11 @@ variables:
SourceVersion: $(Build.SourceVersion)
steps:
- checkout: RGBNET
path: s/RGB.NET
- checkout: self
path: s/Artemis
- checkout: Plugins
path: s/Artemis.Plugins
- task: DotNetCoreCLI@2
displayName: 'RGB.NET - Build'
inputs:
command: 'build'
projects: '$(rgbSolution)'
arguments: '--configuration Release'
- task: DotNetCoreCLI@2
displayName: 'Artemis - Publish'
inputs:
ci/azure-pipelines-rgbnet.yml
-47
View File
@@ -1,47 +0,0 @@
# .NET Desktop
# Build and run tests for .NET Desktop or Windows classic desktop solutions.
# Add steps that publish symbols, save build artifacts, and more:
# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
trigger: none
resources:
repositories:
- repository: RGBdotNET
type: github
endpoint: github.com_SpoinkyNL
name: DarthAffe/RGB.NET
ref: Development
trigger:
branches:
include:
- Development
pool:
vmImage: 'windows-latest'
variables:
rgbSolution: '**/RGB.NET.sln'
steps:
- checkout: RGBdotNET
- task: NuGetToolInstaller@1
- task: NuGetCommand@2
inputs:
restoreSolution: '$(rgbSolution)'
- task: DotNetCoreCLI@2
displayName: 'Build RGB.NET'
inputs:
command: 'build'
projects: '$(rgbSolution)'
arguments: '--configuration Release'
- task: PublishPipelineArtifact@1
displayName: 'Upload build to Azure Pipelines'
inputs:
targetPath: '$(Build.SourcesDirectory)/bin/net5.0'
artifact: 'RGB.NET development build'
publishLocation: 'pipeline'
ci/azure-pipelines.yml
+1 -16
View File
@@ -9,23 +9,17 @@ pr: none
resources:
repositories:
- repository: RGBNET
type: github
endpoint: github.com_SpoinkyNL
name: DarthAffe/RGB.NET
ref: Development
- repository: Plugins
type: github
endpoint: github.com_SpoinkyNL
name: Artemis-RGB/Artemis.Plugins
ref: master
ref: master
pool:
vmImage: 'windows-latest'
variables:
artemisSolution: '**/Artemis.sln'
rgbSolution: '**/RGB.NET.sln'
pluginProjects: '**/Artemis.Plugins.*.csproj'
BuildId: $(Build.BuildId)
BuildNumber: $(Build.BuildNumber)
@@ -33,20 +27,11 @@ variables:
SourceVersion: $(Build.SourceVersion)
steps:
- checkout: RGBNET
path: s/RGB.NET
- checkout: self
path: s/Artemis
- checkout: Plugins
path: s/Artemis.Plugins
- task: DotNetCoreCLI@2
displayName: 'RGB.NET - Build'
inputs:
command: 'build'
projects: '$(rgbSolution)'
arguments: '--configuration Release'
- task: DotNetCoreCLI@2
displayName: 'Artemis - Publish'
inputs:
src/Artemis.ConsoleUI/packages.lock.json
+24
View File
@@ -204,6 +204,27 @@
"Ninject": "3.3.3"
}
},
"RGB.NET.Core": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
},
"RGB.NET.Layout": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"RGB.NET.Presets": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1223,6 +1244,9 @@
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease1",
"RGB.NET.Layout": "1.0.0-prerelease1",
"RGB.NET.Presets": "1.0.0-prerelease1",
"Serilog": "2.10.0",
"Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",
src/Artemis.Core/Artemis.Core.csproj
+3 -11
View File
@@ -47,6 +47,9 @@
<PackageReference Include="Ninject" Version="3.3.4" />
<PackageReference Include="Ninject.Extensions.ChildKernel" Version="3.3.0" />
<PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
<PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease1" />
<PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease1" />
<PackageReference Include="RGB.NET.Presets" Version="1.0.0-prerelease1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
@@ -62,17 +65,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="RGB.NET.Core">
<HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll</HintPath>
</Reference>
<Reference Include="RGB.NET.Layout">
<HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Layout.dll</HintPath>
</Reference>
<Reference Include="RGB.NET.Presets">
<HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Presets.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Update="Resources\intro-profile.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
src/Artemis.Core/packages.lock.json
+24
View File
@@ -73,6 +73,30 @@
"Ninject.Extensions.Factory": "3.3.2"
}
},
"RGB.NET.Core": {
"type": "Direct",
"requested": "[1.0.0-prerelease1, )",
"resolved": "1.0.0-prerelease1",
"contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
},
"RGB.NET.Layout": {
"type": "Direct",
"requested": "[1.0.0-prerelease1, )",
"resolved": "1.0.0-prerelease1",
"contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"RGB.NET.Presets": {
"type": "Direct",
"requested": "[1.0.0-prerelease1, )",
"resolved": "1.0.0-prerelease1",
"contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"Serilog": {
"type": "Direct",
"requested": "[2.10.0, )",
src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+1 -5
View File
@@ -39,6 +39,7 @@
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
<PackageReference Include="Ninject" Version="3.3.4" />
<PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
<PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease1" />
<PackageReference Include="SharpVectors.Reloaded" Version="1.7.5" />
<PackageReference Include="SkiaSharp" Version="2.80.3" />
<PackageReference Include="SkiaSharp.Views.WPF" Version="2.80.3" />
@@ -69,11 +70,6 @@
<Private>false</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="RGB.NET.Core">
<HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Fonts\RobotoMono-Regular.ttf" />
</ItemGroup>
src/Artemis.UI.Shared/packages.lock.json
+25
View File
@@ -52,6 +52,12 @@
"Ninject.Extensions.Factory": "3.3.2"
}
},
"RGB.NET.Core": {
"type": "Direct",
"requested": "[1.0.0-prerelease1, )",
"resolved": "1.0.0-prerelease1",
"contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
},
"SharpVectors.Reloaded": {
"type": "Direct",
"requested": "[1.7.5, )",
@@ -264,6 +270,22 @@
"Ninject": "3.3.3"
}
},
"RGB.NET.Layout": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"RGB.NET.Presets": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1303,6 +1325,9 @@
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease1",
"RGB.NET.Layout": "1.0.0-prerelease1",
"RGB.NET.Presets": "1.0.0-prerelease1",
"Serilog": "2.10.0",
"Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",
src/Artemis.UI/Artemis.UI.csproj
+2 -6
View File
@@ -57,12 +57,6 @@
</ItemGroup>
<ItemGroup>
<!-- TODO: Remove when moving to Nuget, this is so the plugin templates have the DLL to reference -->
<Reference Include="RGB.NET.Core">
<HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Core.dll</HintPath>
</Reference>
<Reference Include="RGB.NET.Layout">
<HintPath>..\..\..\RGB.NET\bin\net5.0\RGB.NET.Layout.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
</ItemGroup>
<ItemGroup>
@@ -152,6 +146,8 @@
<PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
<PackageReference Include="Ookii.Dialogs.Wpf" Version="3.1.0" />
<PackageReference Include="RawInput.Sharp" Version="0.0.4" />
<PackageReference Include="RGB.NET.Core" Version="1.0.0-prerelease1" />
<PackageReference Include="RGB.NET.Layout" Version="1.0.0-prerelease1" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="SkiaSharp.Views.WPF" Version="2.80.3" />
<PackageReference Include="SkiaSharp.Vulkan.SharpVk" Version="2.80.3" />
src/Artemis.UI/packages.lock.json
+27
View File
@@ -122,6 +122,21 @@
"NETStandard.Library": "1.6.1"
}
},
"RGB.NET.Core": {
"type": "Direct",
"requested": "[1.0.0-prerelease1, )",
"resolved": "1.0.0-prerelease1",
"contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
},
"RGB.NET.Layout": {
"type": "Direct",
"requested": "[1.0.0-prerelease1, )",
"resolved": "1.0.0-prerelease1",
"contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"Serilog": {
"type": "Direct",
"requested": "[2.10.0, )",
@@ -387,6 +402,14 @@
"Ninject": "3.3.3"
}
},
"RGB.NET.Presets": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"NoStringEvaluating": {
"type": "Transitive",
"resolved": "2.2.2",
@@ -1449,6 +1472,9 @@
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease1",
"RGB.NET.Layout": "1.0.0-prerelease1",
"RGB.NET.Presets": "1.0.0-prerelease1",
"Serilog": "2.10.0",
"Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",
@@ -1478,6 +1504,7 @@
"Microsoft.Xaml.Behaviors.Wpf": "1.1.31",
"Ninject": "3.3.4",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease1",
"SharpVectors.Reloaded": "1.7.5",
"SkiaSharp": "2.80.3",
"SkiaSharp.Views.WPF": "2.80.3",
src/Artemis.VisualScripting/packages.lock.json
+25
View File
@@ -246,6 +246,27 @@
"Ninject": "3.3.3"
}
},
"RGB.NET.Core": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "aaCPk++kr1TaV/qWYeol5975IN3XifDuuQ9wrCD+nw1cy05BMdGVhuQ72ITb0YRBedssd/btkM51ZABsBd8CEQ=="
},
"RGB.NET.Layout": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "nbaHbcY59tzFSeTDbImhrcR1ZyJpoC0x6WawXdtGXO7x3F91ajM7kM5SJwi/5jHdD61vGV0ARuznmR8ErAWegQ==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"RGB.NET.Presets": {
"type": "Transitive",
"resolved": "1.0.0-prerelease1",
"contentHash": "XU8XeI0fQF26fd0pQHgoe9RaROuvENmZlX/1QyyaN9P3j0LtYmy6ycWZbsXp8byLT0UcGbS+odMiQQAnK+kxgg==",
"dependencies": {
"RGB.NET.Core": "1.0.0-prerelease1"
}
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1309,6 +1330,9 @@
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease1",
"RGB.NET.Layout": "1.0.0-prerelease1",
"RGB.NET.Presets": "1.0.0-prerelease1",
"Serilog": "2.10.0",
"Serilog.Sinks.Console": "4.0.0",
"Serilog.Sinks.Debug": "2.0.0",
@@ -1338,6 +1362,7 @@
"Microsoft.Xaml.Behaviors.Wpf": "1.1.31",
"Ninject": "3.3.4",
"Ninject.Extensions.Conventions": "3.3.0",
"RGB.NET.Core": "1.0.0-prerelease1",
"SharpVectors.Reloaded": "1.7.5",
"SkiaSharp": "2.80.3",
"SkiaSharp.Views.WPF": "2.80.3",
src/Avalonia/Artemis.UI.Linux/packages.lock.json
+1785
View File
File diff suppressed because it is too large. Load diff
src/Avalonia/Artemis.UI.MacOS/packages.lock.json
+1785
View File
File diff suppressed because it is too large. Load diff
src/Avalonia/Artemis.UI.Shared/packages.lock.json
+1712
View File
File diff suppressed because it is too large. Load diff
src/Avalonia/Artemis.UI.Windows/packages.lock.json
+1801
View File
File diff suppressed because it is too large. Load diff
src/Avalonia/Artemis.UI/packages.lock.json
+1773
View File
File diff suppressed because it is too large. Load diff