mirror of
https://github.com/greenshot/greenshot
synced 2025-08-22 14:24:43 -07:00
Updates for dependencies, added a new solution for all and reduced the normal solution to the needed ones. Fixed some of the many documentation warnings.
This commit is contained in:
Robin Krom
parent
35d85cefea
commit
f0d544ea5b
39 changed files with 591 additions and 738 deletions
11
NuGet.Config
11
NuGet.Config
|
|
@ -7,9 +7,12 @@
|
|||
<add key="Dapplo.CaliburnMicro" value="https://ci.appveyor.com/nuget/dapplo-caliburnmicro-46kaa8k8ft4i" />
|
||||
<add key="Dapplo.HttpExtensions" value="https://ci.appveyor.com/nuget/dapplo-httpextensions-6qa60p3t5ixy" />
|
||||
<add key="Dapplo.Windows" value="https://ci.appveyor.com/nuget/dapplo-windows-pjnkjqjp7t6a" />
|
||||
<add key="myget.dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="dotnet-core-latest" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
<add key="bdn-nightly" value="https://ci.appveyor.com/nuget/benchmarkdotnet" />
|
||||
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
|
||||
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
|
||||
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
|
||||
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
|
||||
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
|
||||
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
|
||||
<add key="bdn-nightly" value="https://ci.appveyor.com/nuget/benchmarkdotnet" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
23
README.md
23
README.md
|
|
@ -26,21 +26,18 @@ About this repository
|
|||
This repository is work in progress for the next Greenshot (2.0?).
|
||||
|
||||
|
||||
Quick started for developers
|
||||
Quick start for developers
|
||||
----------------------------
|
||||
* Download the latest (!!!) dotnet core SDK from here: https://github.com/dotnet/core-sdk ([quick-link to download](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe))
|
||||
* Make sure you only have the latest dotnet core 3.0 installed!
|
||||
* ~~Make sure you have the latest Visual Studio 2017 (no need for previews), for 15.9.x enable [Use previews of the .NET Core SDK](https://blogs.msdn.microsoft.com/dotnet/2018/11/13/net-core-tooling-update-for-visual-studio-2017-version-15-9/)~~
|
||||
* Make sure you have Visual Studio 2019 Preview, since dotnet core 3.0 sdk 009831 it no longer works with Visual Studio 2017
|
||||
* Make sure you have the latest Visual Studio 2019, and enable "Use previews of the dotnet core SDK", as is shown here: https://stackoverflow.com/a/55033763
|
||||
* Clone the [repository](https://github.com/greenshot/greenshot/tree/develop), branch develop
|
||||
* Open the solution from the src directory in Visual Studio
|
||||
* Rebuild and start... (you might need to rebuild 2x, looking into this)
|
||||
* Rebuild and start...
|
||||
|
||||
If you can't use Visual Studio 2019 (preview) try the following:
|
||||
* Open a powershell in the directory where you cloned this repo
|
||||
* Disable dotnet core 3.0 with the following: .\build.ps1 --settings_skippackageversioncheck=true -Target DisableDNC30
|
||||
* To practically (some encoding issue maintains) undo the previous: .\build.ps1 --settings_skippackageversioncheck=true -Target EnableDNC30
|
||||
* Change src/global.json to contain the dotnet SDK version you have installed (e.g. 2.1.400)
|
||||
* Open a powershell / shell in the directory where you cloned this repo
|
||||
* run dotnet build src/Greenshot.sln
|
||||
|
||||
For users the major changes since 1.2.x are:
|
||||
* dotnet core 3.0 support (why, read here: https://blogs.msdn.microsoft.com/dotnet/2018/10/04/update-on-net-core-3-0-and-net-framework-4-8/ )
|
||||
|
|
@ -52,6 +49,16 @@ For users the major changes since 1.2.x are:
|
|||
* Bug fixes
|
||||
|
||||
|
||||
For developers, the major changes since 1.2.x are:
|
||||
* Move to dotnet core 3.0
|
||||
* A newer and more modern configuration UI, using MahApps.Metro
|
||||
* Due to the update of .NET 2.0 to .NET 4.7.1 a lot of bugs are solved
|
||||
* Added Windows 10 destinations, OCR & share
|
||||
* Better DPI support
|
||||
* Simplified code should make development easier and quicker
|
||||
* Bug fixes
|
||||
|
||||
|
||||
For developers, the major changes since 1.2.x are:
|
||||
* Updated to .NET 4.7.1 and dotnet core 3.0 (multiple targets)
|
||||
* Moved logging from log4net to [Dapplo.Log](https://github.com/dapplo/Dapplo.Log) which is a very simple logger (reviewing changing to Microsoft.Extensions.Logging)
|
||||
|
|
|
|||
24
appveyor.yml
24
appveyor.yml
|
|
@ -1,24 +0,0 @@
|
|||
version: 1.3.0.{build}
|
||||
skip_tags: true
|
||||
os: Visual Studio 2017
|
||||
configuration: Release
|
||||
platform: Any CPU
|
||||
clone_depth: 2
|
||||
test: off
|
||||
branches:
|
||||
only:
|
||||
- develop
|
||||
build_script:
|
||||
- ps: .\build.ps1 --settings_skipverification=true
|
||||
artifacts:
|
||||
- path: artifacts\**\*.nupkg
|
||||
- path: artifacts\**\site.zip
|
||||
- path: artifacts\*.xml
|
||||
- path: artifacts\*.html
|
||||
notifications:
|
||||
- provider: Email
|
||||
to:
|
||||
- robin@getgreenshot.org
|
||||
on_build_success: true
|
||||
on_build_failure: true
|
||||
on_build_status_changed: false
|
||||
|
|
@ -15,7 +15,7 @@ steps:
|
|||
- task: DotNetCoreInstaller@0
|
||||
displayName: 'Install .NET Core SDK 3.0'
|
||||
inputs:
|
||||
version: '3.0.100-preview5-011283'
|
||||
version: '3.0.100-preview6-011644'
|
||||
|
||||
- task: NuGetToolInstaller@0
|
||||
displayName: 'Use NuGet 4.9.3'
|
||||
|
|
|
|||
211
build.cake
211
build.cake
|
|
@ -1,211 +0,0 @@
|
|||
#tool "xunit.runner.console"
|
||||
#tool "OpenCover"
|
||||
#tool "GitVersion.CommandLine"
|
||||
#tool "docfx.console"
|
||||
#tool "PdbGit"
|
||||
// Needed for Cake.Compression, as described here: https://github.com/akordowski/Cake.Compression/issues/3
|
||||
#addin "SharpZipLib"
|
||||
#addin "Cake.FileHelpers"
|
||||
#addin "Cake.DocFx"
|
||||
#addin "Cake.Compression"
|
||||
|
||||
var target = Argument("target", "Build");
|
||||
var configuration = Argument("configuration", "release");
|
||||
|
||||
// Used to publish NuGet packages
|
||||
var nugetApiKey = Argument("nugetApiKey", EnvironmentVariable("NuGetApiKey"));
|
||||
|
||||
// Used to publish coverage report
|
||||
var coverallsRepoToken = Argument("coverallsRepoToken", EnvironmentVariable("CoverallsRepoToken"));
|
||||
|
||||
// where is our solution located?
|
||||
var solutionFilePath = GetFiles("src/*.sln").First();
|
||||
var solutionName = solutionFilePath.GetDirectory().GetDirectoryName();
|
||||
|
||||
// Check if we are in a pull request, publishing of packages and coverage should be skipped
|
||||
var isPullRequest = !string.IsNullOrEmpty(EnvironmentVariable("APPVEYOR_PULL_REQUEST_NUMBER"));
|
||||
|
||||
// Check if the commit is marked as release
|
||||
var isRelease = Argument<bool>("isRelease", string.Compare("[release]", EnvironmentVariable("appveyor_repo_commit_message_extended"), true) == 0);
|
||||
|
||||
// Used to store the version, which is needed during the build and the packaging
|
||||
var version = EnvironmentVariable("APPVEYOR_BUILD_VERSION") ?? "1.0.0";
|
||||
|
||||
Task("Default")
|
||||
.IsDependentOn("Publish");
|
||||
|
||||
// Publish the Artifact of the Package Task to the Nexus Pro
|
||||
Task("Publish")
|
||||
.IsDependentOn("CreateAndUploadCoverageReport")
|
||||
.IsDependentOn("PublishPackages")
|
||||
.WithCriteria(() => !BuildSystem.IsLocalBuild)
|
||||
.WithCriteria(() => !string.IsNullOrEmpty(nugetApiKey))
|
||||
.WithCriteria(() => !isPullRequest)
|
||||
.WithCriteria(() => isRelease)
|
||||
.Does(()=>
|
||||
{
|
||||
});
|
||||
|
||||
Task("PublishPackages")
|
||||
.IsDependentOn("Package")
|
||||
.WithCriteria(() => !BuildSystem.IsLocalBuild)
|
||||
.WithCriteria(() => !string.IsNullOrEmpty(nugetApiKey))
|
||||
.WithCriteria(() => !isPullRequest)
|
||||
.WithCriteria(() => isRelease)
|
||||
.Does(()=>
|
||||
{
|
||||
var settings = new NuGetPushSettings {
|
||||
Source = "https://www.nuget.org/api/v2/package",
|
||||
ApiKey = nugetApiKey
|
||||
};
|
||||
|
||||
var packages = GetFiles("./artifacts/*.nupkg").Where(p => !p.FullPath.ToLower().Contains("symbols"));
|
||||
NuGetPush(packages, settings);
|
||||
});
|
||||
|
||||
// Package the results of the build, if the tests worked, into a NuGet Package
|
||||
Task("Package")
|
||||
.IsDependentOn("Coverage")
|
||||
.IsDependentOn("Documentation")
|
||||
.IsDependentOn("GitLink")
|
||||
.Does(()=>
|
||||
{
|
||||
// N.A.
|
||||
});
|
||||
|
||||
// Build the DocFX documentation site
|
||||
Task("Documentation")
|
||||
.Does(() =>
|
||||
{
|
||||
DocFxMetadata("./doc/docfx.json");
|
||||
DocFxBuild("./doc/docfx.json");
|
||||
|
||||
CreateDirectory("artifacts");
|
||||
// Archive the generated site
|
||||
ZipCompress("./doc/_site", "./artifacts/site.zip");
|
||||
});
|
||||
|
||||
Task("CreateAndUploadCoverageReport")
|
||||
.IsDependentOn("Coverage")
|
||||
.WithCriteria(() => !string.IsNullOrEmpty(coverallsRepoToken))
|
||||
.IsDependentOn("UploadCoverageReport")
|
||||
.Does(() =>
|
||||
{
|
||||
// N.A.
|
||||
});
|
||||
|
||||
Task("UploadCoverageReport")
|
||||
.WithCriteria(() => FileExists("./artifacts/coverage.xml"))
|
||||
.WithCriteria(() => !string.IsNullOrEmpty(coverallsRepoToken))
|
||||
.Does(() =>
|
||||
{
|
||||
// N.A.
|
||||
});
|
||||
|
||||
// Run the XUnit tests via OpenCover, so be get an coverage.xml report
|
||||
Task("Coverage")
|
||||
.IsDependentOn("Build")
|
||||
.WithCriteria(() => !BuildSystem.IsLocalBuild)
|
||||
.WithCriteria(() => GetFiles("./**/*.csproj").Where(csprojFile => csprojFile.FullPath.Contains("Test")).Any())
|
||||
.Does(() =>
|
||||
{
|
||||
});
|
||||
|
||||
// This starts the actual MSBuild
|
||||
Task("Build")
|
||||
.IsDependentOn("RestoreNuGetPackages")
|
||||
.IsDependentOn("Clean")
|
||||
.IsDependentOn("AssemblyVersion")
|
||||
.Does(() =>
|
||||
{
|
||||
var settings = new MSBuildSettings {
|
||||
Verbosity = Verbosity.Minimal,
|
||||
ToolVersion = MSBuildToolVersion.VS2017,
|
||||
Configuration = configuration,
|
||||
PlatformTarget = PlatformTarget.MSIL
|
||||
};
|
||||
|
||||
MSBuild(solutionFilePath.FullPath, settings);
|
||||
|
||||
// Make sure the .dlls in the obj path are not found elsewhere
|
||||
CleanDirectories("./**/obj");
|
||||
});
|
||||
|
||||
// Generate Git links in the PDB files
|
||||
Task("GitLink")
|
||||
.IsDependentOn("Build")
|
||||
.Does(() =>
|
||||
{
|
||||
// N.A.
|
||||
});
|
||||
|
||||
// Load the needed NuGet packages to make the build work
|
||||
Task("RestoreNuGetPackages")
|
||||
.Does(() =>
|
||||
{
|
||||
NuGetRestore(solutionFilePath.FullPath);
|
||||
});
|
||||
|
||||
// Version is written to the AssemblyInfo files when !BuildSystem.IsLocalBuild
|
||||
Task("AssemblyVersion")
|
||||
.Does(() =>
|
||||
{
|
||||
foreach(var assemblyInfoFile in GetFiles("./**/AssemblyInfo.cs").Where(p => p.FullPath.Contains(solutionName))) {
|
||||
var assemblyInfo = ParseAssemblyInfo(assemblyInfoFile.FullPath);
|
||||
CreateAssemblyInfo(assemblyInfoFile.FullPath, new AssemblyInfoSettings {
|
||||
Version = version,
|
||||
InformationalVersion = version,
|
||||
FileVersion = version,
|
||||
|
||||
CLSCompliant = assemblyInfo.ClsCompliant,
|
||||
Company = assemblyInfo.Company,
|
||||
ComVisible = assemblyInfo.ComVisible,
|
||||
Configuration = assemblyInfo.Configuration,
|
||||
Copyright = assemblyInfo.Copyright,
|
||||
//CustomAttributes = assemblyInfo.CustomAttributes,
|
||||
Description = assemblyInfo.Description,
|
||||
//Guid = assemblyInfo.Guid,
|
||||
InternalsVisibleTo = assemblyInfo.InternalsVisibleTo,
|
||||
Product = assemblyInfo.Product,
|
||||
Title = assemblyInfo.Title,
|
||||
Trademark = assemblyInfo.Trademark
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
Task("EnableDNC30")
|
||||
.Does(() =>
|
||||
{
|
||||
ReplaceRegexInFiles("./**/*.csproj", "<TargetFrameworks>.*</TargetFrameworks><!-- net472;netcoreapp3.0 -->", "<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>");
|
||||
ReplaceRegexInFiles("./**/*.csproj", "<Project Sdk=\"Microsoft.NET.Sdk\"><!-- Microsoft.NET.Sdk.WindowsDesktop -->", "<Project Sdk=\"Microsoft.NET.Sdk.WindowsDesktop\">");
|
||||
});
|
||||
|
||||
Task("DisableDNC30")
|
||||
.Does(() =>
|
||||
{
|
||||
ReplaceRegexInFiles("./**/*.csproj", "<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>", "<TargetFrameworks>net472</TargetFrameworks><!-- net472;netcoreapp3.0 -->");
|
||||
ReplaceRegexInFiles("./**/*.csproj", "<Project Sdk=\"Microsoft.NET.Sdk.WindowsDesktop\">", "<Project Sdk=\"Microsoft.NET.Sdk\"><!-- Microsoft.NET.Sdk.WindowsDesktop -->");
|
||||
});
|
||||
|
||||
Task("DNC30Only")
|
||||
.Does(() =>
|
||||
{
|
||||
ReplaceRegexInFiles("./**/*.csproj", "<TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>", "<TargetFramework>netcoreapp3.0</TargetFramework><!-- net472;netcoreapp3.0 -->");
|
||||
});
|
||||
|
||||
Task("ChangeNETVersion")
|
||||
.Does(() =>
|
||||
{
|
||||
ReplaceRegexInFiles("./**/*.csproj", "net471", "net472");
|
||||
});
|
||||
|
||||
// Clean all unneeded files, so we build on a clean file system
|
||||
Task("Clean")
|
||||
.Does(() =>
|
||||
{
|
||||
CleanDirectories("./**/obj");
|
||||
CleanDirectories("./**/bin");
|
||||
CleanDirectories("./artifacts");
|
||||
});
|
||||
|
||||
RunTarget(target);
|
||||
232
build.ps1
232
build.ps1
|
|
@ -1,232 +0,0 @@
|
|||
##########################################################################
|
||||
# This is the Cake bootstrapper script for PowerShell.
|
||||
# This file was downloaded from https://github.com/cake-build/resources
|
||||
# Feel free to change this file to fit your needs.
|
||||
##########################################################################
|
||||
|
||||
<#
|
||||
|
||||
.SYNOPSIS
|
||||
This is a Powershell script to bootstrap a Cake build.
|
||||
|
||||
.DESCRIPTION
|
||||
This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
|
||||
and execute your Cake build script with the parameters you provide.
|
||||
|
||||
.PARAMETER Script
|
||||
The build script to execute.
|
||||
.PARAMETER Target
|
||||
The build script target to run.
|
||||
.PARAMETER Configuration
|
||||
The build configuration to use.
|
||||
.PARAMETER Verbosity
|
||||
Specifies the amount of information to be displayed.
|
||||
.PARAMETER Experimental
|
||||
Tells Cake to use the latest Roslyn release.
|
||||
.PARAMETER WhatIf
|
||||
Performs a dry run of the build script.
|
||||
No tasks will be executed.
|
||||
.PARAMETER Mono
|
||||
Tells Cake to use the Mono scripting engine.
|
||||
.PARAMETER SkipToolPackageRestore
|
||||
Skips restoring of packages.
|
||||
.PARAMETER ScriptArgs
|
||||
Remaining arguments are added here.
|
||||
|
||||
.LINK
|
||||
http://cakebuild.net
|
||||
|
||||
#>
|
||||
|
||||
[CmdletBinding()]
|
||||
Param(
|
||||
[string]$Script = "build.cake",
|
||||
[string]$Target = "Default",
|
||||
[ValidateSet("Release", "Debug")]
|
||||
[string]$Configuration = "Release",
|
||||
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
|
||||
[string]$Verbosity = "Verbose",
|
||||
[switch]$Experimental,
|
||||
[Alias("DryRun","Noop")]
|
||||
[switch]$WhatIf,
|
||||
[switch]$Mono,
|
||||
[switch]$SkipToolPackageRestore,
|
||||
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
|
||||
[string[]]$ScriptArgs
|
||||
)
|
||||
|
||||
# Setup the proxy
|
||||
[System.Net.WebRequest]::DefaultWebProxy = [System.Net.WebRequest]::GetSystemWebProxy()
|
||||
[System.Net.WebRequest]::DefaultWebProxy.Credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials
|
||||
|
||||
[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
|
||||
function MD5HashFile([string] $filePath)
|
||||
{
|
||||
if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
|
||||
{
|
||||
return $null
|
||||
}
|
||||
|
||||
[System.IO.Stream] $file = $null;
|
||||
[System.Security.Cryptography.MD5] $md5 = $null;
|
||||
try
|
||||
{
|
||||
$md5 = [System.Security.Cryptography.MD5]::Create()
|
||||
$file = [System.IO.File]::OpenRead($filePath)
|
||||
return [System.BitConverter]::ToString($md5.ComputeHash($file))
|
||||
}
|
||||
finally
|
||||
{
|
||||
if ($file -ne $null)
|
||||
{
|
||||
$file.Dispose()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Write-Host "Preparing to run build script..."
|
||||
|
||||
if(!$PSScriptRoot){
|
||||
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
|
||||
}
|
||||
|
||||
$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
|
||||
$ADDINS_DIR = Join-Path $TOOLS_DIR "addins"
|
||||
$MODULES_DIR = Join-Path $TOOLS_DIR "modules"
|
||||
$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
|
||||
$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
|
||||
$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
|
||||
$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
|
||||
$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
|
||||
$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
|
||||
$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
|
||||
|
||||
# Should we use mono?
|
||||
$UseMono = "";
|
||||
if($Mono.IsPresent) {
|
||||
Write-Verbose -Message "Using the Mono based scripting engine."
|
||||
$UseMono = "-mono"
|
||||
}
|
||||
|
||||
# Should we use the new Roslyn?
|
||||
$UseExperimental = "";
|
||||
if($Experimental.IsPresent -and !($Mono.IsPresent)) {
|
||||
Write-Verbose -Message "Using experimental version of Roslyn."
|
||||
$UseExperimental = "-experimental"
|
||||
}
|
||||
|
||||
# Is this a dry run?
|
||||
$UseDryRun = "";
|
||||
if($WhatIf.IsPresent) {
|
||||
$UseDryRun = "-dryrun"
|
||||
}
|
||||
|
||||
# Make sure tools folder exists
|
||||
if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
|
||||
Write-Verbose -Message "Creating tools directory..."
|
||||
New-Item -Path $TOOLS_DIR -Type directory | out-null
|
||||
}
|
||||
|
||||
# Make sure that packages.config exist.
|
||||
if (!(Test-Path $PACKAGES_CONFIG)) {
|
||||
Write-Verbose -Message "Downloading packages.config..."
|
||||
try { (New-Object System.Net.WebClient).DownloadFile("http://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
|
||||
Throw "Could not download packages.config."
|
||||
}
|
||||
}
|
||||
|
||||
# Try find NuGet.exe in path if not exists
|
||||
if (!(Test-Path $NUGET_EXE)) {
|
||||
Write-Verbose -Message "Trying to find nuget.exe in PATH..."
|
||||
$existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
|
||||
$NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
|
||||
if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
|
||||
Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
|
||||
$NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
|
||||
}
|
||||
}
|
||||
|
||||
# Try download NuGet.exe if not exists
|
||||
if (!(Test-Path $NUGET_EXE)) {
|
||||
Write-Verbose -Message "Downloading NuGet.exe..."
|
||||
try {
|
||||
(New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE)
|
||||
} catch {
|
||||
Throw "Could not download NuGet.exe."
|
||||
}
|
||||
}
|
||||
|
||||
# Save nuget.exe path to environment to be available to child processed
|
||||
$ENV:NUGET_EXE = $NUGET_EXE
|
||||
|
||||
# Restore tools from NuGet?
|
||||
if(-Not $SkipToolPackageRestore.IsPresent) {
|
||||
Push-Location
|
||||
Set-Location $TOOLS_DIR
|
||||
|
||||
# Check for changes in packages.config and remove installed tools if true.
|
||||
[string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
|
||||
if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
|
||||
($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
|
||||
Write-Verbose -Message "Missing or changed package.config hash..."
|
||||
Remove-Item * -Recurse -Exclude packages.config,nuget.exe
|
||||
}
|
||||
|
||||
Write-Verbose -Message "Restoring tools from NuGet..."
|
||||
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
|
||||
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Throw "An error occured while restoring NuGet tools."
|
||||
}
|
||||
else
|
||||
{
|
||||
$md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
|
||||
}
|
||||
Write-Verbose -Message ($NuGetOutput | out-string)
|
||||
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
# Restore addins from NuGet
|
||||
if (Test-Path $ADDINS_PACKAGES_CONFIG) {
|
||||
Push-Location
|
||||
Set-Location $ADDINS_DIR
|
||||
|
||||
Write-Verbose -Message "Restoring addins from NuGet..."
|
||||
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
|
||||
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Throw "An error occured while restoring NuGet addins."
|
||||
}
|
||||
|
||||
Write-Verbose -Message ($NuGetOutput | out-string)
|
||||
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
# Restore modules from NuGet
|
||||
if (Test-Path $MODULES_PACKAGES_CONFIG) {
|
||||
Push-Location
|
||||
Set-Location $MODULES_DIR
|
||||
|
||||
Write-Verbose -Message "Restoring modules from NuGet..."
|
||||
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
|
||||
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Throw "An error occured while restoring NuGet modules."
|
||||
}
|
||||
|
||||
Write-Verbose -Message ($NuGetOutput | out-string)
|
||||
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
# Make sure that Cake has been installed.
|
||||
if (!(Test-Path $CAKE_EXE)) {
|
||||
Throw "Could not find Cake.exe at $CAKE_EXE"
|
||||
}
|
||||
|
||||
# Start Cake
|
||||
Write-Host "Running build script..."
|
||||
Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
|
||||
exit $LASTEXITCODE
|
||||
|
|
@ -18,6 +18,10 @@
|
|||
<!--RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers-->
|
||||
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
|
||||
<ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
|
||||
<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
|
||||
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||
<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
|
||||
<EmbedUntrackedSources>true</EmbedUntrackedSources>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)' != 'Debug' And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
|
||||
|
|
@ -50,6 +54,7 @@
|
|||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="$(MSBuildProjectName.Contains('Addon.')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo')) And ($(OsProductName.Contains('Windows 10')) Or (!$(OsProductName.Contains('Windows 10')) And !$(MSBuildProjectName.Contains('Win10'))))">
|
||||
|
|
|
|||
331
src/Greenshot-Full.sln
Normal file
331
src/Greenshot-Full.sln
Normal file
|
|
@ -0,0 +1,331 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.28729.10
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot", "Greenshot\Greenshot.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addons", "Greenshot.Addons\Greenshot.Addons.csproj", "{5B924697-4DCD-4F98-85F1-105CB84B7341}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.ExternalCommand", "Greenshot.Addon.ExternalCommand\Greenshot.Addon.ExternalCommand.csproj", "{47F23C86-604E-4CC3-8767-B3D4088F30BB}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Confluence", "Greenshot.Addon.Confluence\Greenshot.Addon.Confluence.csproj", "{C3052651-598A-44E2-AAB3-2E41311D50F9}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Imgur", "Greenshot.Addon.Imgur\Greenshot.Addon.Imgur.csproj", "{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Jira", "Greenshot.Addon.Jira\Greenshot.Addon.Jira.csproj", "{19FEEF09-313F-43C7-819D-F1BCA782B08B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Box", "Greenshot.Addon.Box\Greenshot.Addon.Box.csproj", "{697CF066-9077-4F22-99D9-D989CCE7282B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Dropbox", "Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj", "{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Flickr", "Greenshot.Addon.Flickr\Greenshot.Addon.Flickr.csproj", "{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.GooglePhotos", "Greenshot.Addon.GooglePhotos\Greenshot.Addon.GooglePhotos.csproj", "{1893A2E4-A78A-4713-A8E7-E70058DABEE0}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Office", "Greenshot.Addon.Office\Greenshot.Addon.Office.csproj", "{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Photobucket", "Greenshot.Addon.Photobucket\Greenshot.Addon.Photobucket.csproj", "{9C0ECC4C-7807-4111-916A-4F57BB29788A}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Win10", "Greenshot.Addon.Win10\Greenshot.Addon.Win10.csproj", "{9801F62C-540F-4BFE-9211-6405DEDE563B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Lutim", "Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj", "{D106F86C-CD3D-44FF-B151-2A5D47268B5C}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx", "Greenshot.Gfx\Greenshot.Gfx.csproj", "{F041C685-EB96-4ED1-9ACE-0F5BD836610F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.PerformanceTests", "Greenshot.PerformanceTests\Greenshot.PerformanceTests.csproj", "{5D594C8A-2137-46E1-8D01-B83662825C7B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Tests", "Greenshot.Tests\Greenshot.Tests.csproj", "{9B162E60-12D8-44FD-8093-7D40392F23FA}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.LegacyEditor", "Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj", "{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.OneDrive", "Greenshot.Addon.OneDrive\Greenshot.Addon.OneDrive.csproj", "{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Tfs", "Greenshot.Addon.Tfs\Greenshot.Addon.Tfs.csproj", "{8B3643A5-AFED-49FF-8D66-6348FB102EB2}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.InternetExplorer", "Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj", "{4CCA2717-B8A4-44F7-965B-5687107E4921}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x64.Build.0 = Debug|x64
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x64.ActiveCfg = Release|x64
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x64.Build.0 = Release|x64
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Release|x86.Build.0 = Release|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x64.Build.0 = Debug|x64
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x64.ActiveCfg = Release|x64
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x64.Build.0 = Release|x64
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{5B924697-4DCD-4F98-85F1-105CB84B7341}.Release|x86.Build.0 = Release|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x64.Build.0 = Debug|x64
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x64.ActiveCfg = Release|x64
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x64.Build.0 = Release|x64
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.Build.0 = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.Build.0 = Debug|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.ActiveCfg = Release|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.Build.0 = Release|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.Build.0 = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.Build.0 = Debug|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.ActiveCfg = Release|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.Build.0 = Release|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.Build.0 = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.Build.0 = Debug|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.ActiveCfg = Release|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.Build.0 = Release|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.Build.0 = Debug|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.ActiveCfg = Release|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.Build.0 = Release|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.Build.0 = Debug|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.ActiveCfg = Release|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.Build.0 = Release|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.Build.0 = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.Build.0 = Debug|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.ActiveCfg = Release|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.Build.0 = Release|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.Build.0 = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.Build.0 = Debug|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.ActiveCfg = Release|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.Build.0 = Release|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.Build.0 = Release|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x64.Build.0 = Debug|x64
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x64.ActiveCfg = Release|x64
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x64.Build.0 = Release|x64
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.Build.0 = Debug|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.ActiveCfg = Release|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.Build.0 = Release|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.Build.0 = Debug|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.ActiveCfg = Release|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.Build.0 = Release|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.Build.0 = Debug|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.ActiveCfg = Release|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.Build.0 = Release|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x64.Build.0 = Debug|x64
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x64.ActiveCfg = Release|x64
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x64.Build.0 = Release|x64
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Release|x86.Build.0 = Release|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x64.Build.0 = Debug|x64
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x64.ActiveCfg = Release|x64
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x64.Build.0 = Release|x64
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{5D594C8A-2137-46E1-8D01-B83662825C7B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x64.Build.0 = Debug|x64
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x64.ActiveCfg = Release|x64
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x64.Build.0 = Release|x64
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9B162E60-12D8-44FD-8093-7D40392F23FA}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x64.Build.0 = Debug|x64
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x64.ActiveCfg = Release|x64
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x64.Build.0 = Release|x64
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x86.Build.0 = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.Build.0 = Debug|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.ActiveCfg = Release|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.Build.0 = Release|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x86.Build.0 = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.Build.0 = Debug|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.ActiveCfg = Release|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.Build.0 = Release|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x86.Build.0 = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x64.Build.0 = Debug|x64
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x64.ActiveCfg = Release|x64
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x64.Build.0 = Release|x64
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Release|x86.Build.0 = Release|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x64.Build.0 = Debug|x64
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x64.ActiveCfg = Release|x64
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x64.Build.0 = Release|x64
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {8508EA59-659A-4E08-9232-91774FBA65F2}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Dapplo.Confluence" Version="0.8.16" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="CliWrap" Version="2.2.1" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows">
|
||||
<Version>0.8.22</Version>
|
||||
<Version>0.8.27</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Com">
|
||||
<Version>0.8.22</Version>
|
||||
<Version>0.8.27</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -22,12 +22,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Utils" Version="1.1.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Dapplo.Jira" Version="0.8.9" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -112,11 +112,11 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0262" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
|
||||
<PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />
|
||||
<PackageReference Include="Microsoft.Office.Interop.Outlook" Version="15.0.4797.1003" />
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0262" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0262" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.144-preview" />
|
||||
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview3.19128.7" />
|
||||
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview3" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" />
|
||||
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview4.19212.13" />
|
||||
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview4.1" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -23,13 +23,13 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
|
||||
<Version>1.2.24</Version>
|
||||
<Version>1.2.25</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts">
|
||||
<Version>1.2.24</Version>
|
||||
<Version>1.2.25</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
|
||||
<Version>1.2.24</Version>
|
||||
<Version>1.2.25</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions">
|
||||
<Version>0.9.18</Version>
|
||||
|
|
@ -41,20 +41,20 @@
|
|||
<Version>0.9.18</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard">
|
||||
<Version>0.8.22</Version>
|
||||
<Version>0.8.27</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Dpi">
|
||||
<Version>0.8.22</Version>
|
||||
<Version>0.8.27</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Icons">
|
||||
<Version>0.8.22</Version>
|
||||
<Version>0.8.27</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MahApps.Metro.IconPacks">
|
||||
<Version>3.0.0-alpha0141</Version>
|
||||
<Version>3.0.0-alpha0146</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Svg">
|
||||
<Version>2.4.2</Version>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows.Icons">
|
||||
<Version>0.8.22</Version>
|
||||
<Version>0.8.27</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
|
||||
<Version>1.2.24</Version>
|
||||
<Version>1.2.25</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Svg">
|
||||
<Version>2.4.2</Version>
|
||||
|
|
|
|||
|
|
@ -43,10 +43,10 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.4.3" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.8.27" />
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
|
||||
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0006" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
|
||||
|
|
|
|||
|
|
@ -9,28 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addons", "Greensh
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.ExternalCommand", "Greenshot.Addon.ExternalCommand\Greenshot.Addon.ExternalCommand.csproj", "{47F23C86-604E-4CC3-8767-B3D4088F30BB}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Confluence", "Greenshot.Addon.Confluence\Greenshot.Addon.Confluence.csproj", "{C3052651-598A-44E2-AAB3-2E41311D50F9}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Imgur", "Greenshot.Addon.Imgur\Greenshot.Addon.Imgur.csproj", "{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Jira", "Greenshot.Addon.Jira\Greenshot.Addon.Jira.csproj", "{19FEEF09-313F-43C7-819D-F1BCA782B08B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Box", "Greenshot.Addon.Box\Greenshot.Addon.Box.csproj", "{697CF066-9077-4F22-99D9-D989CCE7282B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Dropbox", "Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj", "{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Flickr", "Greenshot.Addon.Flickr\Greenshot.Addon.Flickr.csproj", "{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.GooglePhotos", "Greenshot.Addon.GooglePhotos\Greenshot.Addon.GooglePhotos.csproj", "{1893A2E4-A78A-4713-A8E7-E70058DABEE0}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Office", "Greenshot.Addon.Office\Greenshot.Addon.Office.csproj", "{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Photobucket", "Greenshot.Addon.Photobucket\Greenshot.Addon.Photobucket.csproj", "{9C0ECC4C-7807-4111-916A-4F57BB29788A}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Win10", "Greenshot.Addon.Win10\Greenshot.Addon.Win10.csproj", "{9801F62C-540F-4BFE-9211-6405DEDE563B}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Lutim", "Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj", "{D106F86C-CD3D-44FF-B151-2A5D47268B5C}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx", "Greenshot.Gfx\Greenshot.Gfx.csproj", "{F041C685-EB96-4ED1-9ACE-0F5BD836610F}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.PerformanceTests", "Greenshot.PerformanceTests\Greenshot.PerformanceTests.csproj", "{5D594C8A-2137-46E1-8D01-B83662825C7B}"
|
||||
|
|
@ -39,14 +19,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Tests", "Greensho
|
|||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.LegacyEditor", "Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj", "{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.OneDrive", "Greenshot.Addon.OneDrive\Greenshot.Addon.OneDrive.csproj", "{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Tfs", "Greenshot.Addon.Tfs\Greenshot.Addon.Tfs.csproj", "{8B3643A5-AFED-49FF-8D66-6348FB102EB2}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Core", "Greenshot.Core\Greenshot.Core.csproj", "{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.InternetExplorer", "Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj", "{4CCA2717-B8A4-44F7-965B-5687107E4921}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Win10", "Greenshot.Addon.Win10\Greenshot.Addon.Win10.csproj", "{6A81B507-29D4-4135-95B7-F4B2C93C699D}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -93,90 +71,6 @@ Global
|
|||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x64.Build.0 = Release|x64
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{47F23C86-604E-4CC3-8767-B3D4088F30BB}.Release|x86.Build.0 = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x64.Build.0 = Debug|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.ActiveCfg = Release|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x64.Build.0 = Release|x64
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{C3052651-598A-44E2-AAB3-2E41311D50F9}.Release|x86.Build.0 = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x64.Build.0 = Debug|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.ActiveCfg = Release|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x64.Build.0 = Release|x64
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Release|x86.Build.0 = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x64.Build.0 = Debug|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.ActiveCfg = Release|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x64.Build.0 = Release|x64
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{19FEEF09-313F-43C7-819D-F1BCA782B08B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x64.Build.0 = Debug|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.ActiveCfg = Release|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x64.Build.0 = Release|x64
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{697CF066-9077-4F22-99D9-D989CCE7282B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x64.Build.0 = Debug|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.ActiveCfg = Release|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x64.Build.0 = Release|x64
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Release|x86.Build.0 = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x64.Build.0 = Debug|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.ActiveCfg = Release|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x64.Build.0 = Release|x64
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Release|x86.Build.0 = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x64.Build.0 = Debug|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.ActiveCfg = Release|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x64.Build.0 = Release|x64
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Release|x86.Build.0 = Release|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
@ -189,42 +83,6 @@ Global
|
|||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x64.Build.0 = Release|x64
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{92599C09-FF29-4ABD-B6E6-C48ECD781BAB}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x64.Build.0 = Debug|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.ActiveCfg = Release|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x64.Build.0 = Release|x64
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x64.Build.0 = Debug|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.ActiveCfg = Release|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x64.Build.0 = Release|x64
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|x86.Build.0 = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x64.Build.0 = Debug|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.ActiveCfg = Release|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x64.Build.0 = Release|x64
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{D106F86C-CD3D-44FF-B151-2A5D47268B5C}.Release|x86.Build.0 = Release|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F041C685-EB96-4ED1-9ACE-0F5BD836610F}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
@ -273,30 +131,6 @@ Global
|
|||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x64.Build.0 = Release|x64
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9F89C5A0-EB75-4F01-97EB-FBC0725733F2}.Release|x86.Build.0 = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x64.Build.0 = Debug|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.ActiveCfg = Release|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x64.Build.0 = Release|x64
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{B35272D3-4631-4FA5-9A3E-85D70ECA9A8D}.Release|x86.Build.0 = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x64.Build.0 = Debug|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.ActiveCfg = Release|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x64.Build.0 = Release|x64
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{8B3643A5-AFED-49FF-8D66-6348FB102EB2}.Release|x86.Build.0 = Release|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BF35190D-B2A7-4CFA-B397-51CB384CF0D7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
@ -321,6 +155,18 @@ Global
|
|||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x64.Build.0 = Release|x64
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{4CCA2717-B8A4-44F7-965B-5687107E4921}.Release|x86.Build.0 = Release|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Debug|x64.Build.0 = Debug|x64
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Release|x64.ActiveCfg = Release|x64
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Release|x64.Build.0 = Release|x64
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{6A81B507-29D4-4135-95B7-F4B2C93C699D}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
|
|
@ -58,33 +58,35 @@
|
|||
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.4.3" />
|
||||
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.24" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.25" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
|
||||
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
|
||||
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.8.22" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.27" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.27" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.8.27" />
|
||||
<PackageReference Include="Fody" Version="4.2.1">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.1" />
|
||||
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0141" />
|
||||
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0146" />
|
||||
<PackageReference Include="Svg" Version="2.4.2" />
|
||||
<PackageReference Include="System.Runtime" Version="4.3.1" />
|
||||
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
|
||||
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview3.19128.7" />
|
||||
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview4.19212.13" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Greenshot.Addon.ExternalCommand\Greenshot.Addon.ExternalCommand.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addon.Office\Greenshot.Addon.Office.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" />
|
||||
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
|
|||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<PublishDir>bin\Release\netcoreapp3.0\publish\</PublishDir>
|
||||
<PublishDir>publish\</PublishDir>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<SelfContained>true</SelfContained>
|
||||
<_IsPortable>false</_IsPortable>
|
||||
|
|
|
|||
|
|
@ -40,12 +40,27 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
/// </summary>
|
||||
private CompositeDisposable _disposables;
|
||||
|
||||
/// <summary>
|
||||
/// Provides the ICoreConfiguration to the view
|
||||
/// </summary>
|
||||
public ICoreConfiguration CoreConfiguration { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Provides the IConfigTranslations to the view
|
||||
/// </summary>
|
||||
public IConfigTranslations ConfigTranslations { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Provides the IGreenshotLanguage to the view
|
||||
/// </summary>
|
||||
public IGreenshotLanguage GreenshotLanguage { get; }
|
||||
|
||||
/// <summary>
|
||||
/// DI Constructor
|
||||
/// </summary>
|
||||
/// <param name="coreConfiguration">ICoreConfiguration</param>
|
||||
/// <param name="configTranslations">IConfigTranslations</param>
|
||||
/// <param name="greenshotLanguage">IGreenshotLanguage</param>
|
||||
public CaptureConfigViewModel(ICoreConfiguration coreConfiguration,
|
||||
IConfigTranslations configTranslations,
|
||||
IGreenshotLanguage greenshotLanguage)
|
||||
|
|
@ -55,6 +70,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
GreenshotLanguage = greenshotLanguage;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Initialize(IConfig config)
|
||||
{
|
||||
// Prepare disposables
|
||||
|
|
@ -75,13 +91,16 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
base.Initialize(config);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnDeactivate(bool close)
|
||||
{
|
||||
_disposables.Dispose();
|
||||
base.OnDeactivate(close);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Defines the capture mode which is going to be used
|
||||
/// </summary>
|
||||
public WindowCaptureModes SelectedWindowCaptureMode
|
||||
{
|
||||
get => CoreConfiguration.WindowCaptureMode;
|
||||
|
|
@ -92,9 +111,14 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Available window capture modes
|
||||
/// </summary>
|
||||
public IDictionary<WindowCaptureModes, string> WindowCaptureModes => GreenshotLanguage.TranslationValuesForEnum<WindowCaptureModes>();
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Defines the screen capture mode which is going to be used
|
||||
/// </summary>
|
||||
public ScreenCaptureMode SelectedScreenCaptureMode
|
||||
{
|
||||
get => CoreConfiguration.ScreenCaptureMode;
|
||||
|
|
@ -105,6 +129,9 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Available screen capture modes
|
||||
/// </summary>
|
||||
public IDictionary<ScreenCaptureMode, string> ScreenCaptureModes => GreenshotLanguage.TranslationValuesForEnum<ScreenCaptureMode>();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,10 +42,27 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
/// </summary>
|
||||
private CompositeDisposable _disposables;
|
||||
|
||||
/// <summary>
|
||||
/// This provides the ICoreConfiguration to the view
|
||||
/// </summary>
|
||||
public ICoreConfiguration CoreConfiguration { get; }
|
||||
|
||||
/// <summary>
|
||||
/// This provides the IConfigTranslations to the view
|
||||
/// </summary>
|
||||
public IConfigTranslations ConfigTranslations { get; }
|
||||
|
||||
/// <summary>
|
||||
/// This provides the IGreenshotLanguage to the view
|
||||
/// </summary>
|
||||
public IGreenshotLanguage GreenshotLanguage { get; }
|
||||
|
||||
/// <summary>
|
||||
/// DI Constructor
|
||||
/// </summary>
|
||||
/// <param name="coreConfiguration">ICoreConfiguration</param>
|
||||
/// <param name="configTranslations">IConfigTranslations</param>
|
||||
/// <param name="greenshotLanguage">IGreenshotLanguage</param>
|
||||
public ClipboardDestinationConfigViewModel(
|
||||
ICoreConfiguration coreConfiguration,
|
||||
IConfigTranslations configTranslations,
|
||||
|
|
@ -57,6 +74,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
CoreConfiguration = coreConfiguration;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Initialize(IConfig config)
|
||||
{
|
||||
// Prepare disposables
|
||||
|
|
@ -75,31 +93,32 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
};
|
||||
DisplayName = typeof(ClipboardDestination).GetDesignation();
|
||||
|
||||
UsedDestinations.Clear();
|
||||
UsedFormats.Clear();
|
||||
|
||||
if (CoreConfiguration.ClipboardFormats.Any())
|
||||
{
|
||||
foreach (var clipboardFormat in CoreConfiguration.ClipboardFormats)
|
||||
{
|
||||
UsedDestinations.Add(clipboardFormat.ToString());
|
||||
UsedFormats.Add(clipboardFormat.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
AvailableDestinations.Clear();
|
||||
AvailableFormats.Clear();
|
||||
foreach (var clipboardFormat in Enum.GetNames(typeof(ClipboardFormats)))
|
||||
{
|
||||
if (clipboardFormat == ClipboardFormats.NONE.ToString())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
AvailableDestinations.Add(clipboardFormat);
|
||||
AvailableFormats.Add(clipboardFormat);
|
||||
}
|
||||
base.Initialize(config);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Commit()
|
||||
{
|
||||
CoreConfiguration.ClipboardFormats = UsedDestinations.Select(format =>
|
||||
CoreConfiguration.ClipboardFormats = UsedFormats.Select(format =>
|
||||
{
|
||||
if (!Enum.TryParse<ClipboardFormats>(format, true, out var clipboardFormat))
|
||||
{
|
||||
|
|
@ -110,15 +129,22 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
base.Commit();
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnDeactivate(bool close)
|
||||
{
|
||||
_disposables.Dispose();
|
||||
base.OnDeactivate(close);
|
||||
}
|
||||
|
||||
public ObservableCollection<string> AvailableDestinations { get; } = new ObservableCollection<string>();
|
||||
/// <summary>
|
||||
/// The available clipboard formats
|
||||
/// </summary>
|
||||
public ObservableCollection<string> AvailableFormats { get; } = new ObservableCollection<string>();
|
||||
|
||||
public ObservableCollection<string> UsedDestinations { get; } = new ObservableCollection<string>();
|
||||
/// <summary>
|
||||
/// The used clipboard formats
|
||||
/// </summary>
|
||||
public ObservableCollection<string> UsedFormats { get; } = new ObservableCollection<string>();
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,10 +42,28 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
/// </summary>
|
||||
private CompositeDisposable _disposables;
|
||||
|
||||
/// <summary>
|
||||
/// Provides the ICoreConfiguration for the view
|
||||
/// </summary>
|
||||
public ICoreConfiguration CoreConfiguration { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Provides the IConfigTranslations for the view
|
||||
/// </summary>
|
||||
public IConfigTranslations ConfigTranslations { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Provides the IGreenshotLanguage for the view
|
||||
/// </summary>
|
||||
public IGreenshotLanguage GreenshotLanguage { get; }
|
||||
|
||||
/// <summary>
|
||||
/// DI Constructor
|
||||
/// </summary>
|
||||
/// <param name="coreConfiguration">ICoreConfiguration</param>
|
||||
/// <param name="configTranslations">IConfigTranslations</param>
|
||||
/// <param name="greenshotLanguage">IGreenshotLanguage</param>
|
||||
/// <param name="destinationHolder">DestinationHolder</param>
|
||||
public DestinationPickerConfigViewModel(
|
||||
ICoreConfiguration coreConfiguration,
|
||||
IConfigTranslations configTranslations,
|
||||
|
|
@ -59,6 +77,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
CoreConfiguration = coreConfiguration;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Initialize(IConfig config)
|
||||
{
|
||||
// Prepare disposables
|
||||
|
|
@ -109,20 +128,28 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
base.Initialize(config);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Commit()
|
||||
{
|
||||
CoreConfiguration.PickerDestinations = UsedDestinations.Select(d => d.Designation).ToList();
|
||||
base.Commit();
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnDeactivate(bool close)
|
||||
{
|
||||
_disposables.Dispose();
|
||||
base.OnDeactivate(close);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This is the list of IDestination which are available
|
||||
/// </summary>
|
||||
public ObservableCollection<IDestination> AvailableDestinations { get; } = new ObservableCollection<IDestination>();
|
||||
|
||||
/// <summary>
|
||||
/// This is the list of IDestination which are currently used
|
||||
/// </summary>
|
||||
public ObservableCollection<IDestination> UsedDestinations { get; } = new ObservableCollection<IDestination>();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,9 @@ using Greenshot.Addons.Core;
|
|||
|
||||
namespace Greenshot.Ui.Configuration.ViewModels
|
||||
{
|
||||
/// <summary>
|
||||
/// This is the vide model for the network configuration
|
||||
/// </summary>
|
||||
public sealed class NetworkConfigViewModel : AuthenticatedConfigNode<Visibility>
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -34,10 +37,21 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
/// </summary>
|
||||
private CompositeDisposable _disposables;
|
||||
|
||||
/// <summary>
|
||||
/// Provides the IHttpConfiguration for the view
|
||||
/// </summary>
|
||||
public IHttpConfiguration HttpConfiguration { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Provides the IGreenshotLanguage for the view
|
||||
/// </summary>
|
||||
public IGreenshotLanguage GreenshotLanguage { get; }
|
||||
|
||||
/// <summary>
|
||||
/// DI Constructor
|
||||
/// </summary>
|
||||
/// <param name="httpConfiguration"></param>
|
||||
/// <param name="greenshotLanguage"></param>
|
||||
public NetworkConfigViewModel(
|
||||
IHttpConfiguration httpConfiguration,
|
||||
IGreenshotLanguage greenshotLanguage
|
||||
|
|
@ -47,6 +61,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
GreenshotLanguage = greenshotLanguage;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Initialize(IConfig config)
|
||||
{
|
||||
// Prepare disposables
|
||||
|
|
@ -66,6 +81,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
base.Initialize(config);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnDeactivate(bool close)
|
||||
{
|
||||
_disposables.Dispose();
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@ using Greenshot.Addons.ViewModels;
|
|||
|
||||
namespace Greenshot.Ui.Configuration.ViewModels
|
||||
{
|
||||
/// <summary>
|
||||
/// This is the view model for the output settings
|
||||
/// </summary>
|
||||
public sealed class OutputConfigViewModel : SimpleConfigScreen
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -33,12 +36,27 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
/// </summary>
|
||||
private CompositeDisposable _disposables;
|
||||
|
||||
/// <summary>
|
||||
/// Provide the ICoreConfiguration to the view
|
||||
/// </summary>
|
||||
public ICoreConfiguration CoreConfiguration { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Provide the IGreenshotLanguage to the view
|
||||
/// </summary>
|
||||
public IGreenshotLanguage GreenshotLanguage { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Provide the FileConfigPartViewModel to the view
|
||||
/// </summary>
|
||||
public FileConfigPartViewModel FileConfigPartViewModel { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// DI Constructor
|
||||
/// </summary>
|
||||
/// <param name="coreConfiguration">ICoreConfiguration</param>
|
||||
/// <param name="greenshotLanguage">IGreenshotLanguage</param>
|
||||
/// <param name="fileConfigPartViewModel">FileConfigPartViewModel</param>
|
||||
public OutputConfigViewModel(
|
||||
ICoreConfiguration coreConfiguration,
|
||||
IGreenshotLanguage greenshotLanguage,
|
||||
|
|
@ -49,6 +67,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
FileConfigPartViewModel = fileConfigPartViewModel;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Initialize(IConfig config)
|
||||
{
|
||||
// Prepare disposables
|
||||
|
|
@ -66,6 +85,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
base.Initialize(config);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnDeactivate(bool close)
|
||||
{
|
||||
_disposables.Dispose();
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@ using Greenshot.Addons.Core;
|
|||
|
||||
namespace Greenshot.Ui.Configuration.ViewModels
|
||||
{
|
||||
/// <summary>
|
||||
/// This is the view model for the printer configuration
|
||||
/// </summary>
|
||||
public sealed class PrintConfigViewModel : SimpleConfigScreen
|
||||
{
|
||||
/// <summary>
|
||||
|
|
@ -32,10 +35,21 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
/// </summary>
|
||||
private CompositeDisposable _disposables;
|
||||
|
||||
/// <summary>
|
||||
/// Provide the ICoreConfiguration to the view
|
||||
/// </summary>
|
||||
public ICoreConfiguration CoreConfiguration { get; }
|
||||
|
||||
/// <summary>
|
||||
/// Provide the IGreenshotLanguage to the view
|
||||
/// </summary>
|
||||
public IGreenshotLanguage GreenshotLanguage { get; }
|
||||
|
||||
/// <summary>
|
||||
/// DI Constructor
|
||||
/// </summary>
|
||||
/// <param name="coreConfiguration">ICoreConfiguration</param>
|
||||
/// <param name="greenshotLanguage">IGreenshotLanguage</param>
|
||||
public PrintConfigViewModel(
|
||||
ICoreConfiguration coreConfiguration,
|
||||
IGreenshotLanguage greenshotLanguage
|
||||
|
|
@ -45,6 +59,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
GreenshotLanguage = greenshotLanguage;
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Initialize(IConfig config)
|
||||
{
|
||||
// Prepare disposables
|
||||
|
|
@ -62,6 +77,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
|
|||
base.Initialize(config);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void OnDeactivate(bool close)
|
||||
{
|
||||
_disposables.Dispose();
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
</Grid.ColumnDefinitions>
|
||||
<Label Content="Available" Grid.Column="0" Grid.Row="0"/>
|
||||
<Label Content="Used" Grid.Column="1" Grid.Row="0"/>
|
||||
<ListView ItemsSource="{Binding AvailableDestinations}" Grid.Column="0" Grid.Row="1"
|
||||
<ListView ItemsSource="{Binding AvailableFormats}" Grid.Column="0" Grid.Row="1"
|
||||
dd:DragDrop.IsDragSource="True"
|
||||
dd:DragDrop.IsDropTarget="True">
|
||||
<ListView.ItemTemplate>
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
</DataTemplate>
|
||||
</ListView.ItemTemplate>
|
||||
</ListView>
|
||||
<ListView ItemsSource="{Binding UsedDestinations}" Grid.Column="1" Grid.Row="1"
|
||||
<ListView ItemsSource="{Binding UsedFormats}" Grid.Column="1" Grid.Row="1"
|
||||
dd:DragDrop.IsDragSource="True"
|
||||
dd:DragDrop.IsDropTarget="True" >
|
||||
<ListView.ItemTemplate>
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<packageSources>
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
Loading…
Add table
Add a link
Reference in a new issue