Skip to content

Commit

Permalink
Migrate to dotnetcore 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@nodew
nodew committed Apr 11, 2020
1 parent 4168d7a commit a42ddb3
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 687 deletions.
213 changes: 12 additions & 201 deletions KatBoard.Setup/KatBoard.Setup.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,76 +22,16 @@
}
"Entry"
{
"MsmKey" = "8:_2123F35A3340F4A4A90B68E3C5A7B150"
"OwnerKey" = "8:_27499407DD114F92B83FE6941D8DEE3D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_27499407DD114F92B83FE6941D8DEE3D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_3D0B75ADFA65A801A3A1859F87D74902"
"OwnerKey" = "8:_27499407DD114F92B83FE6941D8DEE3D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_40E61D80D66C4CE9A3848749CAA32A10"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4ABEF89D3195AB136091BDC0C66E2D7A"
"OwnerKey" = "8:_3D0B75ADFA65A801A3A1859F87D74902"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4ABEF89D3195AB136091BDC0C66E2D7A"
"OwnerKey" = "8:_27499407DD114F92B83FE6941D8DEE3D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E8EAD14DF9A6FA201E9D699D943E9C2B"
"OwnerKey" = "8:_27499407DD114F92B83FE6941D8DEE3D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_27499407DD114F92B83FE6941D8DEE3D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_3D0B75ADFA65A801A3A1859F87D74902"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_4ABEF89D3195AB136091BDC0C66E2D7A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_E8EAD14DF9A6FA201E9D699D943E9C2B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_2123F35A3340F4A4A90B68E3C5A7B150"
"MsmSig" = "8:_UNDEFINED"
}
}
"Configurations"
{
Expand All @@ -117,6 +57,14 @@
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
"Items"
{
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
{
"Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.7.2"
}
}
}
}
"Release"
Expand All @@ -143,11 +91,6 @@
"ComponentsUrl" = "8:"
"Items"
{
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
{
"Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.7.2"
}
}
}
}
Expand All @@ -167,14 +110,6 @@
{
"LaunchCondition"
{
"{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_6ECA038E9D0C414A9DD5CA02CB48225D"
{
"Name" = "8:.NET Framework"
"Message" = "8:[VSDNETMSG]"
"FrameworkVersion" = "8:.NETFramework,Version=v4.7.2"
"AllowLaterVersions" = "11:FALSE"
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=863262"
}
}
}
"File"
Expand All @@ -199,68 +134,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2123F35A3340F4A4A90B68E3C5A7B150"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
"_2123F35A3340F4A4A90B68E3C5A7B150"
{
"Name" = "8:System.Net.Http.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Net.Http.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4D36715318014B31BABE23BCC8CBA777"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_3D0B75ADFA65A801A3A1859F87D74902"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:NHotkey.Wpf, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a76ffb086700b11c, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_3D0B75ADFA65A801A3A1859F87D74902"
{
"Name" = "8:NHotkey.Wpf.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:NHotkey.Wpf.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4D36715318014B31BABE23BCC8CBA777"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_40E61D80D66C4CE9A3848749CAA32A10"
{
"SourcePath" = "8:Uninstall.exe"
Expand All @@ -281,68 +154,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4ABEF89D3195AB136091BDC0C66E2D7A"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:NHotkey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a76ffb086700b11c, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_4ABEF89D3195AB136091BDC0C66E2D7A"
{
"Name" = "8:NHotkey.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:NHotkey.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4D36715318014B31BABE23BCC8CBA777"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E8EAD14DF9A6FA201E9D699D943E9C2B"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_E8EAD14DF9A6FA201E9D699D943E9C2B"
{
"Name" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4D36715318014B31BABE23BCC8CBA777"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
}
"FileType"
{
Expand Down Expand Up @@ -410,15 +221,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:KatBoard"
"ProductCode" = "8:{B0BDD93D-4B69-45F3-955B-56408BF6B415}"
"PackageCode" = "8:{8BCCA740-9223-48E9-A15D-0605D574022D}"
"ProductCode" = "8:{39BD9F19-5FCB-427B-A318-3E2612573EB2}"
"PackageCode" = "8:{8A3D6306-9682-42DC-9750-63690489D088}"
"UpgradeCode" = "8:{F16D15ED-3C8D-46B3-BA47-A371B768191F}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:FALSE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.0"
"ProductVersion" = "8:1.1.0"
"Manufacturer" = "8:NodeW"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down Expand Up @@ -974,7 +785,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_27499407DD114F92B83FE6941D8DEE3D"
{
"SourcePath" = "8:..\\KatBoard\\obj\\x86\\Release\\KatBoard.exe"
"SourcePath" = "8:..\\KatBoard\\obj\\x64\\Release\\netcoreapp3.1\\KatBoard.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_4D36715318014B31BABE23BCC8CBA777"
Expand Down
40 changes: 31 additions & 9 deletions KatBoard.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,61 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29911.84
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KatBoard", "KatBoard\KatBoard.csproj", "{5873AE3D-1582-4601-9104-2FE71C7F2FB6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KatBoard", "KatBoard\KatBoard.csproj", "{5873AE3D-1582-4601-9104-2FE71C7F2FB6}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "KatBoard.Setup", "KatBoard.Setup\KatBoard.Setup.vdproj", "{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|Any CPU.ActiveCfg = Release|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|Any CPU.Build.0 = Release|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x64.ActiveCfg = Debug|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x64.Build.0 = Debug|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x86.ActiveCfg = Release|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x86.Build.0 = Release|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|ARM.ActiveCfg = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|ARM.Build.0 = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|ARM64.Build.0 = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x64.ActiveCfg = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x64.Build.0 = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x86.ActiveCfg = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Debug|x86.Build.0 = Debug|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|Any CPU.Build.0 = Release|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|x64.ActiveCfg = Release|x86
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|x64.Build.0 = Release|x86
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|ARM.ActiveCfg = Release|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|ARM.Build.0 = Release|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|ARM64.ActiveCfg = Release|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|ARM64.Build.0 = Release|Any CPU
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|x64.ActiveCfg = Release|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|x64.Build.0 = Release|x64
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|x86.ActiveCfg = Release|x86
{5873AE3D-1582-4601-9104-2FE71C7F2FB6}.Release|x86.Build.0 = Release|x86
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|Any CPU.ActiveCfg = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|ARM.ActiveCfg = Debug
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|ARM.Build.0 = Debug
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|ARM64.ActiveCfg = Debug
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|ARM64.Build.0 = Debug
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|x64.ActiveCfg = Debug
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|x64.Build.0 = Debug
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Debug|x86.ActiveCfg = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|Any CPU.ActiveCfg = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|ARM.ActiveCfg = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|ARM.Build.0 = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|ARM64.ActiveCfg = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|ARM64.Build.0 = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|x64.ActiveCfg = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|x64.Build.0 = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|x86.ActiveCfg = Release
{C1F553DF-B331-4C6B-9B19-3E9E2A825B99}.Release|x86.Build.0 = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 0 additions & 6 deletions KatBoard/App.config
View file

This file was deleted.

2 changes: 1 addition & 1 deletion KatBoard/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public App()
protected override void OnStartup(StartupEventArgs e)
{
trayIcon = new TaskbarIcon();
trayIcon.IconSource = new BitmapImage(ResourceAccessor.Get(@"Assets\Cat.ico"));
trayIcon.IconSource = new BitmapImage(ResourceAccessor.Get(@"Assets/Cat.ico"));
trayIcon.ToolTipText = "KatBoard is running";
trayIcon.ContextMenu = GetTrayContextMenu();

Expand Down
Loading

0 comments on commit a42ddb3

Please sign in to comment.