diff --git a/ci/azure-pipelines-rgbnet.yml b/ci/azure-pipelines-rgbnet.yml deleted file mode 100644 index 6ed1a08c3..000000000 --- a/ci/azure-pipelines-rgbnet.yml +++ /dev/null @@ -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' \ No newline at end of file diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 4ebae1d56..301d799c5 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -4,124 +4,134 @@ # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net trigger: -- master + - master pr: none resources: repositories: - - repository: Plugins - type: github - endpoint: github.com_SpoinkyNL - name: Artemis-RGB/Artemis.Plugins - ref: master + - repository: Plugins + type: github + endpoint: github.com_SpoinkyNL + name: Artemis-RGB/Artemis.Plugins + ref: master pool: - vmImage: 'windows-latest' + vmImage: "windows-latest" variables: - artemisSolution: '**/Artemis.sln' - pluginProjects: '**/Artemis.Plugins.*.csproj' + artemisSolution: "**/Artemis.sln" + pluginProjects: "**/Artemis.Plugins.*.csproj" BuildId: $(Build.BuildId) BuildNumber: $(Build.BuildNumber) SourceBranch: $(Build.SourceBranch) SourceVersion: $(Build.SourceVersion) - -steps: -- checkout: self - path: s/Artemis -- checkout: Plugins - path: s/Artemis.Plugins -- task: DotNetCoreCLI@2 - displayName: 'Artemis - Publish' - inputs: - command: 'publish' - publishWebProjects: false - projects: '$(artemisSolution)' - arguments: '--runtime win-x64 --self-contained false --configuration Release --output $(Build.ArtifactStagingDirectory)/build /nowarn:cs1591' - zipAfterPublish: false - modifyOutputPath: false +jobs: + - job: Windows + steps: + - checkout: self + path: s/Artemis + - checkout: Plugins + path: s/Artemis.Plugins -- task: PowerShell@2 - displayName: 'Artemis - Create buildinfo.json' - inputs: - targetType: 'inline' - script: | - $OFS = "`r`n" - SET-Content -Path 'buildinfo.json' -Value ('{' + $OFS + ' "BuildId": 0,' + $OFS + ' "BuildNumber": 0.0,' + $OFS + ' "SourceBranch": "",' + $OFS + ' "SourceVersion": ""' + $OFS + '}') - workingDirectory: '$(Build.ArtifactStagingDirectory)/build' + - task: DotNetCoreCLI@2 + displayName: "Artemis - Publish" + inputs: + command: "publish" + publishWebProjects: false + projects: "$(artemisSolution)" + arguments: '.\Artemis.UI.Windows\Artemis.UI.Windows.csproj --configuration Release --runtime win10-x64 --output $(Build.ArtifactStagingDirectory)/build /nowarn:cs1591' + zipAfterPublish: false + modifyOutputPath: false -- task: FileTransform@1 - displayName: 'Artemis - Populate buildinfo.json' - inputs: - folderPath: '$(Build.ArtifactStagingDirectory)/build' - fileType: 'json' - targetFiles: '**/buildinfo.json' + - task: PowerShell@2 + displayName: "Artemis - Create buildinfo.json" + inputs: + targetType: "inline" + script: | + $OFS = "`r`n" + SET-Content -Path 'buildinfo.json' -Value ('{' + $OFS + ' "BuildId": 0,' + $OFS + ' "BuildNumber": 0.0,' + $OFS + ' "SourceBranch": "",' + $OFS + ' "SourceVersion": ""' + $OFS + '}') + workingDirectory: "$(Build.ArtifactStagingDirectory)/build" -# Copy Artemis binaries to where plugin projects expect them -- task: CopyFiles@2 - displayName: 'Plugins - Prepare Artemis binaries' - inputs: - SourceFolder: '$(Build.ArtifactStagingDirectory)/build' - Contents: '**' - TargetFolder: 'Artemis/src/Artemis.UI/bin/net5.0-windows' + - task: FileTransform@1 + displayName: "Artemis - Populate buildinfo.json" + inputs: + folderPath: "$(Build.ArtifactStagingDirectory)/build" + fileType: "json" + targetFiles: "**/buildinfo.json" -- task: PowerShell@2 - displayName: 'Plugins - Insert build number into plugin.json' - inputs: - targetType: 'inline' - script: | - Get-ChildItem -Recurse -Filter plugin.json | - Foreach-Object { - $buidNumber = "1.0.1." + $Env:BUILD_BUILDID; - $a = Get-Content $_.FullName | ConvertFrom-Json - $a.Version = $buidNumber; - $a | ConvertTo-Json | Set-Content $_.FullName - } - workingDirectory: 'Artemis.Plugins' + # Copy Artemis Core binaries to where plugin projects expect them + - task: CopyFiles@2 + displayName: "Plugins - Prepare Artemis Core binaries" + inputs: + SourceFolder: "$(Build.ArtifactStagingDirectory)/build" + Contents: "**" + TargetFolder: "Artemis/src/Artemis.Core/bin/net6.0" -- task: DotNetCoreCLI@2 - displayName: 'Plugins - Publish' - inputs: - command: 'publish' - publishWebProjects: false - arguments: '--runtime win-x64 --configuration Release --self-contained false --output $(Build.ArtifactStagingDirectory)/build/Plugins' - projects: '$(pluginProjects)' - zipAfterPublish: true + # Copy Artemis Shared UI binaries to where plugin projects expect them + - task: CopyFiles@2 + displayName: "Plugins - Prepare Artemis Shared UI binaries" + inputs: + SourceFolder: "$(Build.ArtifactStagingDirectory)/build" + Contents: "**" + TargetFolder: "Artemis/src/Artemis.UI.Shared/bin/net6.0" -- task: PublishPipelineArtifact@1 - displayName: 'Upload build to Azure Pipelines' - inputs: - targetPath: '$(Build.ArtifactStagingDirectory)/build' - artifact: 'Artemis build' - publishLocation: 'pipeline' + - task: PowerShell@2 + displayName: "Plugins - Insert build number into plugin.json" + inputs: + targetType: "inline" + script: | + Get-ChildItem -Recurse -Filter plugin.json | + Foreach-Object { + $buidNumber = "1.0.1." + $Env:BUILD_BUILDID; + $a = Get-Content $_.FullName | ConvertFrom-Json + $a.Version = $buidNumber; + $a | ConvertTo-Json | Set-Content $_.FullName + } + workingDirectory: "Artemis.Plugins" -- task: ArchiveFiles@2 - displayName: 'ZIP binaries' - inputs: - rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/build' - includeRootFolder: false - archiveType: 'zip' - archiveFile: '$(Build.ArtifactStagingDirectory)/archive/artemis-build.zip' - replaceExistingArchive: true + - task: DotNetCoreCLI@2 + displayName: "Plugins - Publish" + inputs: + command: "publish" + publishWebProjects: false + arguments: "--configuration Release --runtime win10-x64 --output $(Build.ArtifactStagingDirectory)/build/Plugins" + projects: "$(pluginProjects)" + zipAfterPublish: true -- task: PowerShell@2 - displayName: 'Calculate ZIP hash' - inputs: - targetType: 'inline' - script: '(Get-FileHash .\artemis-build.zip).Hash | Out-File -FilePath .\hash.txt' - workingDirectory: '$(Build.ArtifactStagingDirectory)/archive' + - task: PublishPipelineArtifact@1 + displayName: "Upload build to Azure Pipelines" + inputs: + targetPath: "$(Build.ArtifactStagingDirectory)/build" + artifact: "Artemis build" + publishLocation: "pipeline" -- task: FtpUpload@2 - displayName: 'Upload binaries to FTP' - inputs: - credentialsOption: 'inputs' - serverUrl: 'ftp://artemis-rgb.com' - username: 'devops' - password: '$(ftp_password)' - rootDirectory: '$(Build.ArtifactStagingDirectory)/archive' - filePatterns: '**' - remoteDirectory: '/builds.artemis-rgb.com/binaries/$(Build.SourceBranchName)/$(Build.BuildNumber)' - clean: false - preservePaths: true - trustSSL: false \ No newline at end of file + - task: ArchiveFiles@2 + displayName: "ZIP binaries" + inputs: + rootFolderOrFile: "$(Build.ArtifactStagingDirectory)/build" + includeRootFolder: false + archiveType: "zip" + archiveFile: "$(Build.ArtifactStagingDirectory)/archive/artemis-build-windows.zip" + replaceExistingArchive: true + + - task: PowerShell@2 + displayName: "Calculate ZIP hash" + inputs: + targetType: "inline" + script: '(Get-FileHash .\artemis-build-windows.zip).Hash | Out-File -FilePath .\hash-windows.txt' + workingDirectory: "$(Build.ArtifactStagingDirectory)/archive" + + - task: FtpUpload@2 + displayName: "Upload binaries to FTP" + inputs: + credentialsOption: "inputs" + serverUrl: "ftp://artemis-rgb.com" + username: "devops" + password: "$(ftp_password)" + rootDirectory: "$(Build.ArtifactStagingDirectory)/archive" + filePatterns: "**" + remoteDirectory: "/builds.artemis-rgb.com/binaries/$(Build.SourceBranchName)/$(Build.BuildNumber)" + clean: false + preservePaths: true + trustSSL: false diff --git a/src/Artemis.UI.Linux/packages.lock.json b/src/Artemis.UI.Linux/packages.lock.json index 5c1ceadc6..2064c8127 100644 --- a/src/Artemis.UI.Linux/packages.lock.json +++ b/src/Artemis.UI.Linux/packages.lock.json @@ -30,18 +30,6 @@ "Avalonia.X11": "0.10.18" } }, - "Avalonia.Diagnostics": { - "type": "Direct", - "requested": "[0.10.18, )", - "resolved": "0.10.18", - "contentHash": "3PjA6r0mmRUeS+R34VtYAyzmlPeqflsQ9B8E2TrZKGke0Wo6t3JsvPWA8ynA/ii0icPnnn7nmQaEZQs07ZthxQ==", - "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Controls.DataGrid": "0.10.18", - "Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0", - "System.Reactive": "5.0.0" - } - }, "Avalonia.ReactiveUI": { "type": "Direct", "requested": "[0.10.18, )", @@ -70,11 +58,11 @@ }, "Avalonia.Controls.DataGrid": { "type": "Transitive", - "resolved": "0.10.18", - "contentHash": "LDNZxnzk++GgBeUKsqmeWJDQgF83C4Quk4Wn0z5P6vIm1f5YSSFJL6JbibbIAvjqlGjqWWFTBZpHMUNjdyw4Aw==", + "resolved": "0.10.15", + "contentHash": "a0A0RcZU1FSCUxKHkYP49df9HjlvU9gdS+DqF6VR7zc3TYbaFwLHF0pg5fsjkW/FMgzUfO70NX/WwpDeu6celg==", "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Remote.Protocol": "0.10.18", + "Avalonia": "0.10.15", + "Avalonia.Remote.Protocol": "0.10.15", "JetBrains.Annotations": "10.3.0", "System.Reactive": "5.0.0" } @@ -340,75 +328,6 @@ "resolved": "0.10.4", "contentHash": "enc2U+/1UnF3rtocxb5ofcg7cJSmJI4adbYPr8DZa5bQzvhqA/VbjlcalxoqjI3CR2RvM5WWpjKT0p3BriFJjw==" }, - "Microsoft.CodeAnalysis.Analyzers": { - "type": "Transitive", - "resolved": "2.9.6", - "contentHash": "Kmms3TxGQMNb95Cu/3K+0bIcMnV4qf/phZBLAB0HUi65rBPxP4JO3aM2LoAcb+DFS600RQJMZ7ZLyYDTbLwJOQ==" - }, - "Microsoft.CodeAnalysis.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "3ncA7cV+iXGA1VYwe2UEZXcvWyZSlbexWjM9AvocP7sik5UD93qt9Hq0fMRGk0jFRmvmE4T2g+bGfXiBVZEhLw==", - "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "2.9.6", - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.3", - "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.3" - } - }, - "Microsoft.CodeAnalysis.CSharp": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "/LsTtgcMN6Tu1oo7/WYbRAHL4/ubXC/miEakwTpcZKJKtFo7D0AK95Hw0dbGxul6C8WJu60v6NP2435TDYZM+Q==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.CSharp.Scripting": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "tLgqc76qXHmONUhWhxo7z3TcL/LmGFWIUJm1exbQmVJohuQvJnejUMxmVkdxDfMuMZU1fIyJXPZ6Fkp4FEneAg==", - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.CodeAnalysis.CSharp": "[3.4.0]", - "Microsoft.CodeAnalysis.Common": "[3.4.0]", - "Microsoft.CodeAnalysis.Scripting.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.Scripting.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "+b6I3DZL2zvck+B/E/aiOveakj5U2G2BcYODQxcGh2IDbatNU3XXxGT1HumkWB5uIZI2Leu0opBgBpjScmjGMA==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "P+MBhIM0YX+JqROuf7i306ZLJEjQYA9uUyRDE+OqwUI5sh41e2ZbPQV3LfAPh+29cmceE1pUffXsGfR4eMY3KA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0" - } - }, "Microsoft.DotNet.PlatformAbstractions": { "type": "Transitive", "resolved": "3.1.6", @@ -822,11 +741,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==" - }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -1284,11 +1198,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1609,8 +1518,13 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==" + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, "System.Threading.Timer": { "type": "Transitive", @@ -1776,7 +1690,6 @@ "Avalonia.Controls.PanAndZoom": "10.14.0", "Avalonia.Controls.Skia": "0.10.16", "Avalonia.Desktop": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", @@ -1797,7 +1710,6 @@ "dependencies": { "Artemis.Core": "1.0.0", "Avalonia": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", diff --git a/src/Artemis.UI.MacOS/packages.lock.json b/src/Artemis.UI.MacOS/packages.lock.json index 5c1ceadc6..2064c8127 100644 --- a/src/Artemis.UI.MacOS/packages.lock.json +++ b/src/Artemis.UI.MacOS/packages.lock.json @@ -30,18 +30,6 @@ "Avalonia.X11": "0.10.18" } }, - "Avalonia.Diagnostics": { - "type": "Direct", - "requested": "[0.10.18, )", - "resolved": "0.10.18", - "contentHash": "3PjA6r0mmRUeS+R34VtYAyzmlPeqflsQ9B8E2TrZKGke0Wo6t3JsvPWA8ynA/ii0icPnnn7nmQaEZQs07ZthxQ==", - "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Controls.DataGrid": "0.10.18", - "Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0", - "System.Reactive": "5.0.0" - } - }, "Avalonia.ReactiveUI": { "type": "Direct", "requested": "[0.10.18, )", @@ -70,11 +58,11 @@ }, "Avalonia.Controls.DataGrid": { "type": "Transitive", - "resolved": "0.10.18", - "contentHash": "LDNZxnzk++GgBeUKsqmeWJDQgF83C4Quk4Wn0z5P6vIm1f5YSSFJL6JbibbIAvjqlGjqWWFTBZpHMUNjdyw4Aw==", + "resolved": "0.10.15", + "contentHash": "a0A0RcZU1FSCUxKHkYP49df9HjlvU9gdS+DqF6VR7zc3TYbaFwLHF0pg5fsjkW/FMgzUfO70NX/WwpDeu6celg==", "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Remote.Protocol": "0.10.18", + "Avalonia": "0.10.15", + "Avalonia.Remote.Protocol": "0.10.15", "JetBrains.Annotations": "10.3.0", "System.Reactive": "5.0.0" } @@ -340,75 +328,6 @@ "resolved": "0.10.4", "contentHash": "enc2U+/1UnF3rtocxb5ofcg7cJSmJI4adbYPr8DZa5bQzvhqA/VbjlcalxoqjI3CR2RvM5WWpjKT0p3BriFJjw==" }, - "Microsoft.CodeAnalysis.Analyzers": { - "type": "Transitive", - "resolved": "2.9.6", - "contentHash": "Kmms3TxGQMNb95Cu/3K+0bIcMnV4qf/phZBLAB0HUi65rBPxP4JO3aM2LoAcb+DFS600RQJMZ7ZLyYDTbLwJOQ==" - }, - "Microsoft.CodeAnalysis.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "3ncA7cV+iXGA1VYwe2UEZXcvWyZSlbexWjM9AvocP7sik5UD93qt9Hq0fMRGk0jFRmvmE4T2g+bGfXiBVZEhLw==", - "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "2.9.6", - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.3", - "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.3" - } - }, - "Microsoft.CodeAnalysis.CSharp": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "/LsTtgcMN6Tu1oo7/WYbRAHL4/ubXC/miEakwTpcZKJKtFo7D0AK95Hw0dbGxul6C8WJu60v6NP2435TDYZM+Q==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.CSharp.Scripting": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "tLgqc76qXHmONUhWhxo7z3TcL/LmGFWIUJm1exbQmVJohuQvJnejUMxmVkdxDfMuMZU1fIyJXPZ6Fkp4FEneAg==", - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.CodeAnalysis.CSharp": "[3.4.0]", - "Microsoft.CodeAnalysis.Common": "[3.4.0]", - "Microsoft.CodeAnalysis.Scripting.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.Scripting.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "+b6I3DZL2zvck+B/E/aiOveakj5U2G2BcYODQxcGh2IDbatNU3XXxGT1HumkWB5uIZI2Leu0opBgBpjScmjGMA==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "P+MBhIM0YX+JqROuf7i306ZLJEjQYA9uUyRDE+OqwUI5sh41e2ZbPQV3LfAPh+29cmceE1pUffXsGfR4eMY3KA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0" - } - }, "Microsoft.DotNet.PlatformAbstractions": { "type": "Transitive", "resolved": "3.1.6", @@ -822,11 +741,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==" - }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -1284,11 +1198,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1609,8 +1518,13 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==" + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, "System.Threading.Timer": { "type": "Transitive", @@ -1776,7 +1690,6 @@ "Avalonia.Controls.PanAndZoom": "10.14.0", "Avalonia.Controls.Skia": "0.10.16", "Avalonia.Desktop": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", @@ -1797,7 +1710,6 @@ "dependencies": { "Artemis.Core": "1.0.0", "Avalonia": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", diff --git a/src/Artemis.UI.Shared/packages.lock.json b/src/Artemis.UI.Shared/packages.lock.json index 2a1592c73..bf966a26d 100644 --- a/src/Artemis.UI.Shared/packages.lock.json +++ b/src/Artemis.UI.Shared/packages.lock.json @@ -17,18 +17,6 @@ "System.ValueTuple": "4.5.0" } }, - "Avalonia.Diagnostics": { - "type": "Direct", - "requested": "[0.10.18, )", - "resolved": "0.10.18", - "contentHash": "3PjA6r0mmRUeS+R34VtYAyzmlPeqflsQ9B8E2TrZKGke0Wo6t3JsvPWA8ynA/ii0icPnnn7nmQaEZQs07ZthxQ==", - "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Controls.DataGrid": "0.10.18", - "Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0", - "System.Reactive": "5.0.0" - } - }, "Avalonia.ReactiveUI": { "type": "Direct", "requested": "[0.10.18, )", @@ -125,11 +113,11 @@ }, "Avalonia.Controls.DataGrid": { "type": "Transitive", - "resolved": "0.10.18", - "contentHash": "LDNZxnzk++GgBeUKsqmeWJDQgF83C4Quk4Wn0z5P6vIm1f5YSSFJL6JbibbIAvjqlGjqWWFTBZpHMUNjdyw4Aw==", + "resolved": "0.10.15", + "contentHash": "a0A0RcZU1FSCUxKHkYP49df9HjlvU9gdS+DqF6VR7zc3TYbaFwLHF0pg5fsjkW/FMgzUfO70NX/WwpDeu6celg==", "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Remote.Protocol": "0.10.18", + "Avalonia": "0.10.15", + "Avalonia.Remote.Protocol": "0.10.15", "JetBrains.Annotations": "10.3.0", "System.Reactive": "5.0.0" } @@ -328,75 +316,6 @@ "resolved": "0.10.4", "contentHash": "enc2U+/1UnF3rtocxb5ofcg7cJSmJI4adbYPr8DZa5bQzvhqA/VbjlcalxoqjI3CR2RvM5WWpjKT0p3BriFJjw==" }, - "Microsoft.CodeAnalysis.Analyzers": { - "type": "Transitive", - "resolved": "2.9.6", - "contentHash": "Kmms3TxGQMNb95Cu/3K+0bIcMnV4qf/phZBLAB0HUi65rBPxP4JO3aM2LoAcb+DFS600RQJMZ7ZLyYDTbLwJOQ==" - }, - "Microsoft.CodeAnalysis.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "3ncA7cV+iXGA1VYwe2UEZXcvWyZSlbexWjM9AvocP7sik5UD93qt9Hq0fMRGk0jFRmvmE4T2g+bGfXiBVZEhLw==", - "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "2.9.6", - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.3", - "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.3" - } - }, - "Microsoft.CodeAnalysis.CSharp": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "/LsTtgcMN6Tu1oo7/WYbRAHL4/ubXC/miEakwTpcZKJKtFo7D0AK95Hw0dbGxul6C8WJu60v6NP2435TDYZM+Q==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.CSharp.Scripting": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "tLgqc76qXHmONUhWhxo7z3TcL/LmGFWIUJm1exbQmVJohuQvJnejUMxmVkdxDfMuMZU1fIyJXPZ6Fkp4FEneAg==", - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.CodeAnalysis.CSharp": "[3.4.0]", - "Microsoft.CodeAnalysis.Common": "[3.4.0]", - "Microsoft.CodeAnalysis.Scripting.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.Scripting.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "+b6I3DZL2zvck+B/E/aiOveakj5U2G2BcYODQxcGh2IDbatNU3XXxGT1HumkWB5uIZI2Leu0opBgBpjScmjGMA==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "P+MBhIM0YX+JqROuf7i306ZLJEjQYA9uUyRDE+OqwUI5sh41e2ZbPQV3LfAPh+29cmceE1pUffXsGfR4eMY3KA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0" - } - }, "Microsoft.DotNet.PlatformAbstractions": { "type": "Transitive", "resolved": "3.1.6", @@ -745,11 +664,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==" - }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -1207,11 +1121,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1483,15 +1392,6 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.1.2", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" - } - }, "System.Text.Encoding.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -1532,8 +1432,13 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==" + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, "System.Threading.Timer": { "type": "Transitive", diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj index 2ba084e85..86c9b387d 100644 --- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj +++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj @@ -8,7 +8,8 @@ bin False Artemis 2 - ..\Artemis.UI\Assets\Images\Logo\application.ico + ..\Artemis.UI\Assets\Images\Logo\application.ico + true diff --git a/src/Artemis.UI.Windows/packages.lock.json b/src/Artemis.UI.Windows/packages.lock.json index 4ce21430a..09ab3921e 100644 --- a/src/Artemis.UI.Windows/packages.lock.json +++ b/src/Artemis.UI.Windows/packages.lock.json @@ -30,18 +30,6 @@ "Avalonia.X11": "0.10.18" } }, - "Avalonia.Diagnostics": { - "type": "Direct", - "requested": "[0.10.18, )", - "resolved": "0.10.18", - "contentHash": "3PjA6r0mmRUeS+R34VtYAyzmlPeqflsQ9B8E2TrZKGke0Wo6t3JsvPWA8ynA/ii0icPnnn7nmQaEZQs07ZthxQ==", - "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Controls.DataGrid": "0.10.18", - "Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0", - "System.Reactive": "5.0.0" - } - }, "Avalonia.ReactiveUI": { "type": "Direct", "requested": "[0.10.18, )", @@ -119,11 +107,11 @@ }, "Avalonia.Controls.DataGrid": { "type": "Transitive", - "resolved": "0.10.18", - "contentHash": "LDNZxnzk++GgBeUKsqmeWJDQgF83C4Quk4Wn0z5P6vIm1f5YSSFJL6JbibbIAvjqlGjqWWFTBZpHMUNjdyw4Aw==", + "resolved": "0.10.15", + "contentHash": "a0A0RcZU1FSCUxKHkYP49df9HjlvU9gdS+DqF6VR7zc3TYbaFwLHF0pg5fsjkW/FMgzUfO70NX/WwpDeu6celg==", "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Remote.Protocol": "0.10.18", + "Avalonia": "0.10.15", + "Avalonia.Remote.Protocol": "0.10.15", "JetBrains.Annotations": "10.3.0", "System.Reactive": "5.0.0" } @@ -378,75 +366,6 @@ "resolved": "0.10.4", "contentHash": "enc2U+/1UnF3rtocxb5ofcg7cJSmJI4adbYPr8DZa5bQzvhqA/VbjlcalxoqjI3CR2RvM5WWpjKT0p3BriFJjw==" }, - "Microsoft.CodeAnalysis.Analyzers": { - "type": "Transitive", - "resolved": "2.9.6", - "contentHash": "Kmms3TxGQMNb95Cu/3K+0bIcMnV4qf/phZBLAB0HUi65rBPxP4JO3aM2LoAcb+DFS600RQJMZ7ZLyYDTbLwJOQ==" - }, - "Microsoft.CodeAnalysis.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "3ncA7cV+iXGA1VYwe2UEZXcvWyZSlbexWjM9AvocP7sik5UD93qt9Hq0fMRGk0jFRmvmE4T2g+bGfXiBVZEhLw==", - "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "2.9.6", - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.3", - "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.3" - } - }, - "Microsoft.CodeAnalysis.CSharp": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "/LsTtgcMN6Tu1oo7/WYbRAHL4/ubXC/miEakwTpcZKJKtFo7D0AK95Hw0dbGxul6C8WJu60v6NP2435TDYZM+Q==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.CSharp.Scripting": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "tLgqc76qXHmONUhWhxo7z3TcL/LmGFWIUJm1exbQmVJohuQvJnejUMxmVkdxDfMuMZU1fIyJXPZ6Fkp4FEneAg==", - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.CodeAnalysis.CSharp": "[3.4.0]", - "Microsoft.CodeAnalysis.Common": "[3.4.0]", - "Microsoft.CodeAnalysis.Scripting.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.Scripting.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "+b6I3DZL2zvck+B/E/aiOveakj5U2G2BcYODQxcGh2IDbatNU3XXxGT1HumkWB5uIZI2Leu0opBgBpjScmjGMA==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "P+MBhIM0YX+JqROuf7i306ZLJEjQYA9uUyRDE+OqwUI5sh41e2ZbPQV3LfAPh+29cmceE1pUffXsGfR4eMY3KA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0" - } - }, "Microsoft.DotNet.PlatformAbstractions": { "type": "Transitive", "resolved": "3.1.6", @@ -878,11 +797,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==" - }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -1340,11 +1254,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1665,8 +1574,13 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==" + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, "System.Threading.Timer": { "type": "Transitive", @@ -1832,7 +1746,6 @@ "Avalonia.Controls.PanAndZoom": "10.14.0", "Avalonia.Controls.Skia": "0.10.16", "Avalonia.Desktop": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", @@ -1853,7 +1766,6 @@ "dependencies": { "Artemis.Core": "1.0.0", "Avalonia": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", diff --git a/src/Artemis.UI/packages.lock.json b/src/Artemis.UI/packages.lock.json index 514e5a064..3b738a163 100644 --- a/src/Artemis.UI/packages.lock.json +++ b/src/Artemis.UI/packages.lock.json @@ -50,18 +50,6 @@ "Avalonia.X11": "0.10.18" } }, - "Avalonia.Diagnostics": { - "type": "Direct", - "requested": "[0.10.18, )", - "resolved": "0.10.18", - "contentHash": "3PjA6r0mmRUeS+R34VtYAyzmlPeqflsQ9B8E2TrZKGke0Wo6t3JsvPWA8ynA/ii0icPnnn7nmQaEZQs07ZthxQ==", - "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Controls.DataGrid": "0.10.18", - "Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0", - "System.Reactive": "5.0.0" - } - }, "Avalonia.ReactiveUI": { "type": "Direct", "requested": "[0.10.18, )", @@ -197,11 +185,11 @@ }, "Avalonia.Controls.DataGrid": { "type": "Transitive", - "resolved": "0.10.18", - "contentHash": "LDNZxnzk++GgBeUKsqmeWJDQgF83C4Quk4Wn0z5P6vIm1f5YSSFJL6JbibbIAvjqlGjqWWFTBZpHMUNjdyw4Aw==", + "resolved": "0.10.15", + "contentHash": "a0A0RcZU1FSCUxKHkYP49df9HjlvU9gdS+DqF6VR7zc3TYbaFwLHF0pg5fsjkW/FMgzUfO70NX/WwpDeu6celg==", "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Remote.Protocol": "0.10.18", + "Avalonia": "0.10.15", + "Avalonia.Remote.Protocol": "0.10.15", "JetBrains.Annotations": "10.3.0", "System.Reactive": "5.0.0" } @@ -392,75 +380,6 @@ "resolved": "0.10.4", "contentHash": "enc2U+/1UnF3rtocxb5ofcg7cJSmJI4adbYPr8DZa5bQzvhqA/VbjlcalxoqjI3CR2RvM5WWpjKT0p3BriFJjw==" }, - "Microsoft.CodeAnalysis.Analyzers": { - "type": "Transitive", - "resolved": "2.9.6", - "contentHash": "Kmms3TxGQMNb95Cu/3K+0bIcMnV4qf/phZBLAB0HUi65rBPxP4JO3aM2LoAcb+DFS600RQJMZ7ZLyYDTbLwJOQ==" - }, - "Microsoft.CodeAnalysis.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "3ncA7cV+iXGA1VYwe2UEZXcvWyZSlbexWjM9AvocP7sik5UD93qt9Hq0fMRGk0jFRmvmE4T2g+bGfXiBVZEhLw==", - "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "2.9.6", - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.3", - "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.3" - } - }, - "Microsoft.CodeAnalysis.CSharp": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "/LsTtgcMN6Tu1oo7/WYbRAHL4/ubXC/miEakwTpcZKJKtFo7D0AK95Hw0dbGxul6C8WJu60v6NP2435TDYZM+Q==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.CSharp.Scripting": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "tLgqc76qXHmONUhWhxo7z3TcL/LmGFWIUJm1exbQmVJohuQvJnejUMxmVkdxDfMuMZU1fIyJXPZ6Fkp4FEneAg==", - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.CodeAnalysis.CSharp": "[3.4.0]", - "Microsoft.CodeAnalysis.Common": "[3.4.0]", - "Microsoft.CodeAnalysis.Scripting.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.Scripting.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "+b6I3DZL2zvck+B/E/aiOveakj5U2G2BcYODQxcGh2IDbatNU3XXxGT1HumkWB5uIZI2Leu0opBgBpjScmjGMA==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "P+MBhIM0YX+JqROuf7i306ZLJEjQYA9uUyRDE+OqwUI5sh41e2ZbPQV3LfAPh+29cmceE1pUffXsGfR4eMY3KA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0" - } - }, "Microsoft.DotNet.PlatformAbstractions": { "type": "Transitive", "resolved": "3.1.6", @@ -835,11 +754,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==" - }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -1297,11 +1211,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1622,8 +1531,13 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==" + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, "System.Threading.Timer": { "type": "Transitive", @@ -1784,7 +1698,6 @@ "dependencies": { "Artemis.Core": "1.0.0", "Avalonia": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", diff --git a/src/Artemis.VisualScripting/packages.lock.json b/src/Artemis.VisualScripting/packages.lock.json index 54e2c950d..bd1d243f5 100644 --- a/src/Artemis.VisualScripting/packages.lock.json +++ b/src/Artemis.VisualScripting/packages.lock.json @@ -103,11 +103,11 @@ }, "Avalonia.Controls.DataGrid": { "type": "Transitive", - "resolved": "0.10.18", - "contentHash": "LDNZxnzk++GgBeUKsqmeWJDQgF83C4Quk4Wn0z5P6vIm1f5YSSFJL6JbibbIAvjqlGjqWWFTBZpHMUNjdyw4Aw==", + "resolved": "0.10.15", + "contentHash": "a0A0RcZU1FSCUxKHkYP49df9HjlvU9gdS+DqF6VR7zc3TYbaFwLHF0pg5fsjkW/FMgzUfO70NX/WwpDeu6celg==", "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Remote.Protocol": "0.10.18", + "Avalonia": "0.10.15", + "Avalonia.Remote.Protocol": "0.10.15", "JetBrains.Annotations": "10.3.0", "System.Reactive": "5.0.0" } @@ -124,17 +124,6 @@ "Avalonia.X11": "0.10.15" } }, - "Avalonia.Diagnostics": { - "type": "Transitive", - "resolved": "0.10.18", - "contentHash": "3PjA6r0mmRUeS+R34VtYAyzmlPeqflsQ9B8E2TrZKGke0Wo6t3JsvPWA8ynA/ii0icPnnn7nmQaEZQs07ZthxQ==", - "dependencies": { - "Avalonia": "0.10.18", - "Avalonia.Controls.DataGrid": "0.10.18", - "Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0", - "System.Reactive": "5.0.0" - } - }, "Avalonia.FreeDesktop": { "type": "Transitive", "resolved": "0.10.15", @@ -346,75 +335,6 @@ "resolved": "0.10.4", "contentHash": "enc2U+/1UnF3rtocxb5ofcg7cJSmJI4adbYPr8DZa5bQzvhqA/VbjlcalxoqjI3CR2RvM5WWpjKT0p3BriFJjw==" }, - "Microsoft.CodeAnalysis.Analyzers": { - "type": "Transitive", - "resolved": "2.9.6", - "contentHash": "Kmms3TxGQMNb95Cu/3K+0bIcMnV4qf/phZBLAB0HUi65rBPxP4JO3aM2LoAcb+DFS600RQJMZ7ZLyYDTbLwJOQ==" - }, - "Microsoft.CodeAnalysis.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "3ncA7cV+iXGA1VYwe2UEZXcvWyZSlbexWjM9AvocP7sik5UD93qt9Hq0fMRGk0jFRmvmE4T2g+bGfXiBVZEhLw==", - "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "2.9.6", - "System.Collections.Immutable": "1.5.0", - "System.Memory": "4.5.3", - "System.Reflection.Metadata": "1.6.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.2", - "System.Text.Encoding.CodePages": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.3" - } - }, - "Microsoft.CodeAnalysis.CSharp": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "/LsTtgcMN6Tu1oo7/WYbRAHL4/ubXC/miEakwTpcZKJKtFo7D0AK95Hw0dbGxul6C8WJu60v6NP2435TDYZM+Q==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.CSharp.Scripting": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "tLgqc76qXHmONUhWhxo7z3TcL/LmGFWIUJm1exbQmVJohuQvJnejUMxmVkdxDfMuMZU1fIyJXPZ6Fkp4FEneAg==", - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.CodeAnalysis.CSharp": "[3.4.0]", - "Microsoft.CodeAnalysis.Common": "[3.4.0]", - "Microsoft.CodeAnalysis.Scripting.Common": "[3.4.0]" - } - }, - "Microsoft.CodeAnalysis.Scripting.Common": { - "type": "Transitive", - "resolved": "3.4.0", - "contentHash": "+b6I3DZL2zvck+B/E/aiOveakj5U2G2BcYODQxcGh2IDbatNU3XXxGT1HumkWB5uIZI2Leu0opBgBpjScmjGMA==", - "dependencies": { - "Microsoft.CodeAnalysis.Common": "[3.4.0]" - } - }, - "Microsoft.CSharp": { - "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "P+MBhIM0YX+JqROuf7i306ZLJEjQYA9uUyRDE+OqwUI5sh41e2ZbPQV3LfAPh+29cmceE1pUffXsGfR4eMY3KA==", - "dependencies": { - "System.Collections": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Globalization": "4.3.0", - "System.Linq": "4.3.0", - "System.Linq.Expressions": "4.3.0", - "System.ObjectModel": "4.3.0", - "System.Reflection": "4.3.0", - "System.Reflection.Extensions": "4.3.0", - "System.Reflection.Primitives": "4.3.0", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Runtime.Extensions": "4.3.0", - "System.Runtime.InteropServices": "4.3.0", - "System.Threading": "4.3.0" - } - }, "Microsoft.DotNet.PlatformAbstractions": { "type": "Transitive", "resolved": "3.1.6", @@ -777,11 +697,6 @@ "System.Threading.Tasks": "4.3.0" } }, - "System.Collections.Immutable": { - "type": "Transitive", - "resolved": "1.5.0", - "contentHash": "EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==" - }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -1239,11 +1154,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1515,15 +1425,6 @@ "System.Runtime": "4.3.0" } }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==", - "dependencies": { - "Microsoft.NETCore.Platforms": "2.1.2", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" - } - }, "System.Text.Encoding.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -1564,8 +1465,13 @@ }, "System.Threading.Tasks.Extensions": { "type": "Transitive", - "resolved": "4.5.3", - "contentHash": "+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==" + "resolved": "4.3.0", + "contentHash": "npvJkVKl5rKXrtl1Kkm6OhOUaYGEiF9wFbppFRWSMoApKzt2PiPHT2Bb8a5sAWxprvdOAtvaARS9QYMznEUtug==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } }, "System.Threading.Timer": { "type": "Transitive", @@ -1726,7 +1632,6 @@ "dependencies": { "Artemis.Core": "1.0.0", "Avalonia": "0.10.18", - "Avalonia.Diagnostics": "0.10.18", "Avalonia.ReactiveUI": "0.10.18", "Avalonia.Xaml.Behaviors": "0.10.18", "DynamicData": "7.9.14", diff --git a/src/Artemis.sln b/src/Artemis.sln index c3da716cd..dec26a200 100644 --- a/src/Artemis.sln +++ b/src/Artemis.sln @@ -21,67 +21,41 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Artemis.VisualScripting", " EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 - Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.ActiveCfg = Debug|x64 {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.ActiveCfg = Debug|x64 {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|x64.Build.0 = Debug|x64 - {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|Any CPU.ActiveCfg = Release|x64 {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|x64.ActiveCfg = Release|x64 {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Release|x64.Build.0 = Release|x64 - {E489E5E3-1A65-4AF5-A1EA-F9805FD19A65}.Debug|Any CPU.Build.0 = Debug|x64 - {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|Any CPU.ActiveCfg = Debug|x64 {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|x64.ActiveCfg = Debug|x64 {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|x64.Build.0 = Debug|x64 - {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|Any CPU.ActiveCfg = Release|x64 {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|x64.ActiveCfg = Release|x64 {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Release|x64.Build.0 = Release|x64 - {9B811F9B-86B9-4771-87AF-72BAE7078A36}.Debug|Any CPU.Build.0 = Debug|x64 - {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Debug|Any CPU.ActiveCfg = Debug|x64 {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Debug|x64.ActiveCfg = Debug|x64 {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Debug|x64.Build.0 = Debug|x64 - {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|Any CPU.ActiveCfg = Release|x64 {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|x64.ActiveCfg = Release|x64 - {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Debug|Any CPU.Build.0 = Debug|x64 {035CBB38-7B9E-4375-A39C-E9A5B01F23A5}.Release|x64.Build.0 = Release|x64 - {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|Any CPU.ActiveCfg = Debug|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|x64.ActiveCfg = Debug|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|x64.Build.0 = Debug|x64 - {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|Any CPU.ActiveCfg = Release|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|x64.ActiveCfg = Release|x64 - {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Debug|Any CPU.Build.0 = Debug|x64 {05A5AB0F-A303-4404-9623-4DB1C9AA1DA0}.Release|x64.Build.0 = Release|x64 - {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|Any CPU.ActiveCfg = Debug|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|x64.ActiveCfg = Debug|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|x64.Build.0 = Debug|x64 - {DE45A288-9320-461F-BE2A-26DFE3817216}.Release|Any CPU.ActiveCfg = Release|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Release|x64.ActiveCfg = Release|x64 - {DE45A288-9320-461F-BE2A-26DFE3817216}.Debug|Any CPU.Build.0 = Debug|x64 {DE45A288-9320-461F-BE2A-26DFE3817216}.Release|x64.Build.0 = Release|x64 - {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|Any CPU.ActiveCfg = Debug|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|x64.ActiveCfg = Debug|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|x64.Build.0 = Debug|x64 - {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|Any CPU.ActiveCfg = Release|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|x64.ActiveCfg = Release|x64 - {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Debug|Any CPU.Build.0 = Debug|x64 {9012C8E2-3BEC-42F5-8270-7352A5922B04}.Release|x64.Build.0 = Release|x64 - {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|Any CPU.ActiveCfg = Debug|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|x64.ActiveCfg = Debug|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|x64.Build.0 = Debug|x64 - {2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|Any CPU.ActiveCfg = Release|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|x64.ActiveCfg = Release|x64 - {2F5F16DC-FACF-4559-9882-37C2949814C7}.Debug|Any CPU.Build.0 = Debug|x64 {2F5F16DC-FACF-4559-9882-37C2949814C7}.Release|x64.Build.0 = Release|x64 - {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|Any CPU.ActiveCfg = Debug|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|x64.ActiveCfg = Debug|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|x64.Build.0 = Debug|x64 - {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|Any CPU.ActiveCfg = Release|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|x64.ActiveCfg = Release|x64 - {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Debug|Any CPU.Build.0 = Debug|x64 {412B921A-26F5-4AE6-8B32-0C19BE54F421}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution