diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..98b4a57 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,33 @@ +{ + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "version": "0.2.0", + "configurations": [ + { + "name": "Launch WoaDeployer Gui", + "type": "clr", + "request": "launch", + "preLaunchTask": null, + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/Source/Deployer.Lumia.Gui/bin/Debug/WoaDeployer.exe", + "args": [], + "cwd": "${workspaceFolder}/Source/Deployer.Lumia.Gui/bin/Debug/", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Framework Attach", + "type": "clr", + "request": "attach", + "processId": "${command:pickProcess}" + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..677020d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "dotnet-test-explorer.testProjectPath": "**/*.Tests.csproj", + "vssolution.altSolutionFolders": [ + "Source", + "Source/DeployerPlatform", + "Source/DeployerPlatform/Registry" + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..dfe854a --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,47 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Cleanup", + "command": "Get-ChildItem -Path '${workspaceFolder}/Source/*' -Include bin, obj -Recurse | Remove-Item -Force -Recurse -Verbose; dotnet nuget locals -c all;", + "type": "shell", + "group": "build", + "problemMatcher": [] + }, + { + "label": "Build WoaDeployer for lumia", + "command": "msb16 '/t:clean;restore;build' '${workspaceFolder}/Source/WoaDeployer for Lumia.sln'", + "type": "shell", + "group": "build", + "problemMatcher": "$msCompile" + }, + { + "label": "Build Woa DeployerPlatform", + "command": "msb16 '/t:clean;restore;build' '${workspaceFolder}/Source/DeployerPlatform/Deployer Platform.sln'", + "type": "shell", + "group": "build", + "problemMatcher": "$msCompile" + }, + { + "label": "Test WoaDeployer for lumia", + "command": "vst16 '${workspaceFolder}/Source/Deployer.Lumia.Tests/bin/debug/Deployer.Lumia.Tests.dll'", + "type": "shell", + "group": "build", + "problemMatcher": [] + }, + { + "label": "Test Woa DeployerPlatform Deployer", + "command": "vst16 '${workspaceFolder}/Source/DeployerPlatform/Deployer.Tests/bin/debug/netcoreapp2.1/Deployer.Tests.dll'", + "type": "shell", + "group": "build", + "problemMatcher": [] + }, + { + "label": "Test Woa DeployerPlatform NetFx", + "command": "vst16 '${workspaceFolder}/Source/DeployerPlatform/Deployer.NetFx.Tests/bin/debug/net472/Deployer.NetFx.Tests.dll'", + "type": "shell", + "group": "build", + "problemMatcher": [] + } + ] +} \ No newline at end of file diff --git a/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj b/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj index 3d04ea9..ba6cde5 100644 --- a/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj +++ b/Source/Deployer.Lumia.Console/Deployer.Lumia.Console.csproj @@ -8,7 +8,7 @@ Library Deployer.Lumia.Console Deployer.Lumia.Console - v4.6.2 + v4.7.2 512 true true @@ -35,7 +35,9 @@ 4 7.1 - + + win + diff --git a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj index a1e1d8f..403a235 100644 --- a/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj +++ b/Source/Deployer.Lumia.Gui/Deployer.Lumia.Gui.csproj @@ -36,6 +36,9 @@ prompt 4 + + win + app.manifest diff --git a/Source/Deployer.Lumia/Deployer.Lumia.csproj b/Source/Deployer.Lumia/Deployer.Lumia.csproj index a7dc1d3..e4bc645 100644 --- a/Source/Deployer.Lumia/Deployer.Lumia.csproj +++ b/Source/Deployer.Lumia/Deployer.Lumia.csproj @@ -2,6 +2,7 @@ netstandard2.0 + win diff --git a/Source/DeployerPlatform b/Source/DeployerPlatform index 3807a7f..b43b68f 160000 --- a/Source/DeployerPlatform +++ b/Source/DeployerPlatform @@ -1 +1 @@ -Subproject commit 3807a7f0f0713e78ade9cb92d348437ec3805a9b +Subproject commit b43b68fff7a9d775463a457e115cdb401d8bc520 diff --git a/Source/WoaDeployer for Lumia.sln b/Source/WoaDeployer for Lumia.sln index 05f34b1..29333ca 100644 --- a/Source/WoaDeployer for Lumia.sln +++ b/Source/WoaDeployer for Lumia.sln @@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Deployer", "DeployerPlatfor EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deployer.NetFx", "DeployerPlatform\Deployer.NetFx\Deployer.NetFx.csproj", "{FBEDAF0E-E2ED-4005-8D83-F980FA67FEB2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Registry", "DeployerPlatform\Registry\Registry\Registry.csproj", "{C14523F8-313E-4338-B04B-7C15EC730FFD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zafiro.Core", "DeployerPlatform\Zafiro\Zafiro.Core\Zafiro.Core.csproj", "{FC32478F-26EA-4774-878C-92B08E468ABA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deployer.Lumia.Tests", "Deployer.Lumia.Tests\Deployer.Lumia.Tests.csproj", "{06F14C7E-E1B3-4B97-A4B1-D778ABC4FC4F}" @@ -70,12 +68,6 @@ Global {FBEDAF0E-E2ED-4005-8D83-F980FA67FEB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {FBEDAF0E-E2ED-4005-8D83-F980FA67FEB2}.Release|Any CPU.ActiveCfg = Release|Any CPU {FBEDAF0E-E2ED-4005-8D83-F980FA67FEB2}.Release|Any CPU.Build.0 = Release|Any CPU - {C14523F8-313E-4338-B04B-7C15EC730FFD}.Analysis|Any CPU.ActiveCfg = Release|Any CPU - {C14523F8-313E-4338-B04B-7C15EC730FFD}.Analysis|Any CPU.Build.0 = Release|Any CPU - {C14523F8-313E-4338-B04B-7C15EC730FFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C14523F8-313E-4338-B04B-7C15EC730FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C14523F8-313E-4338-B04B-7C15EC730FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C14523F8-313E-4338-B04B-7C15EC730FFD}.Release|Any CPU.Build.0 = Release|Any CPU {FC32478F-26EA-4774-878C-92B08E468ABA}.Analysis|Any CPU.ActiveCfg = Release|Any CPU {FC32478F-26EA-4774-878C-92B08E468ABA}.Analysis|Any CPU.Build.0 = Release|Any CPU {FC32478F-26EA-4774-878C-92B08E468ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -131,7 +123,6 @@ Global GlobalSection(NestedProjects) = preSolution {20D40DC1-0237-47A0-B169-B420159E341C} = {37EB1151-97FC-4910-BA90-DB0AA05EA107} {FBEDAF0E-E2ED-4005-8D83-F980FA67FEB2} = {37EB1151-97FC-4910-BA90-DB0AA05EA107} - {C14523F8-313E-4338-B04B-7C15EC730FFD} = {37EB1151-97FC-4910-BA90-DB0AA05EA107} {FC32478F-26EA-4774-878C-92B08E468ABA} = {37EB1151-97FC-4910-BA90-DB0AA05EA107} {0F950392-CEA6-466D-B91F-987C21EC7B24} = {37EB1151-97FC-4910-BA90-DB0AA05EA107} {FD4462AC-5EB1-4923-A5D6-83DE6C102817} = {37EB1151-97FC-4910-BA90-DB0AA05EA107} diff --git a/global.json b/global.json new file mode 100644 index 0000000..7427ccd --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "sdk": { + "version": "2.2.300" + } + } \ No newline at end of file