From aabb14049a39cdb94e1971068dc43172f3cf3b86 Mon Sep 17 00:00:00 2001 From: Jens True Date: Fri, 17 Jun 2022 21:09:10 +0200 Subject: [PATCH] dotnet6 port --- .gitignore | 457 +++++++++++++++++- .vscode/launch.json | 26 + .vscode/tasks.json | 41 ++ ...outBox.Designer.cs => AboutBox.Designer.cs | 0 Tidstagning/AboutBox.cs => AboutBox.cs | 0 Tidstagning/AboutBox.resx => AboutBox.resx | 0 ...nfigUI.Designer.cs => ConfigUI.Designer.cs | 0 Tidstagning/ConfigUI.cs => ConfigUI.cs | 0 Tidstagning/ConfigUI.resx => ConfigUI.resx | 0 Tidstagning/Entry.cs => Entry.cs | 0 .../MainUI.Designer.cs => MainUI.Designer.cs | 0 Tidstagning/MainUI.cs => MainUI.cs | 0 Tidstagning/MainUI.resx => MainUI.resx | 0 Tidstagning/Procedure.cs => Procedure.cs | 5 +- Program.cs | 21 + .../Settings.Designer.cs | 0 .../Settings.settings | 0 Properties/launchSettings.json | 7 + Tidstagning/Relay.cs => Relay.cs | 0 Tidstagning/ResultList.cs => ResultList.cs | 0 ...ttings.Designer.cs => Settings.Designer.cs | 0 Tidstagning/Settings.cs => Settings.cs | 0 Tidstagning.csproj | 15 + Tidstagning.sln | 25 - Tidstagning/Program.cs | 35 -- Tidstagning/Tidstagning.csproj | 54 --- Tidstagning/Tidstagning.csproj.user | 14 - 27 files changed, 566 insertions(+), 134 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json rename Tidstagning/AboutBox.Designer.cs => AboutBox.Designer.cs (100%) rename Tidstagning/AboutBox.cs => AboutBox.cs (100%) rename Tidstagning/AboutBox.resx => AboutBox.resx (100%) rename Tidstagning/ConfigUI.Designer.cs => ConfigUI.Designer.cs (100%) rename Tidstagning/ConfigUI.cs => ConfigUI.cs (100%) rename Tidstagning/ConfigUI.resx => ConfigUI.resx (100%) rename Tidstagning/Entry.cs => Entry.cs (100%) rename Tidstagning/MainUI.Designer.cs => MainUI.Designer.cs (100%) rename Tidstagning/MainUI.cs => MainUI.cs (100%) rename Tidstagning/MainUI.resx => MainUI.resx (100%) rename Tidstagning/Procedure.cs => Procedure.cs (97%) create mode 100644 Program.cs rename {Tidstagning/Properties => Properties}/Settings.Designer.cs (100%) rename {Tidstagning/Properties => Properties}/Settings.settings (100%) create mode 100644 Properties/launchSettings.json rename Tidstagning/Relay.cs => Relay.cs (100%) rename Tidstagning/ResultList.cs => ResultList.cs (100%) rename Tidstagning/Settings.Designer.cs => Settings.Designer.cs (100%) rename Tidstagning/Settings.cs => Settings.cs (100%) create mode 100644 Tidstagning.csproj delete mode 100644 Tidstagning.sln delete mode 100644 Tidstagning/Program.cs delete mode 100644 Tidstagning/Tidstagning.csproj delete mode 100644 Tidstagning/Tidstagning.csproj.user diff --git a/.gitignore b/.gitignore index 4d141be..8afdcb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,454 @@ -.vs -obj/ -bin/ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# Tye +.tye/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +## +## Visual studio for Mac +## + + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..981f94d --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,26 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // 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 + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/bin/Debug/net6.0-windows/Tidstagning.dll", + "args": [], + "cwd": "${workspaceFolder}", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..f5647bf --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Tidstagning.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/Tidstagning.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/Tidstagning.csproj" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/Tidstagning/AboutBox.Designer.cs b/AboutBox.Designer.cs similarity index 100% rename from Tidstagning/AboutBox.Designer.cs rename to AboutBox.Designer.cs diff --git a/Tidstagning/AboutBox.cs b/AboutBox.cs similarity index 100% rename from Tidstagning/AboutBox.cs rename to AboutBox.cs diff --git a/Tidstagning/AboutBox.resx b/AboutBox.resx similarity index 100% rename from Tidstagning/AboutBox.resx rename to AboutBox.resx diff --git a/Tidstagning/ConfigUI.Designer.cs b/ConfigUI.Designer.cs similarity index 100% rename from Tidstagning/ConfigUI.Designer.cs rename to ConfigUI.Designer.cs diff --git a/Tidstagning/ConfigUI.cs b/ConfigUI.cs similarity index 100% rename from Tidstagning/ConfigUI.cs rename to ConfigUI.cs diff --git a/Tidstagning/ConfigUI.resx b/ConfigUI.resx similarity index 100% rename from Tidstagning/ConfigUI.resx rename to ConfigUI.resx diff --git a/Tidstagning/Entry.cs b/Entry.cs similarity index 100% rename from Tidstagning/Entry.cs rename to Entry.cs diff --git a/Tidstagning/MainUI.Designer.cs b/MainUI.Designer.cs similarity index 100% rename from Tidstagning/MainUI.Designer.cs rename to MainUI.Designer.cs diff --git a/Tidstagning/MainUI.cs b/MainUI.cs similarity index 100% rename from Tidstagning/MainUI.cs rename to MainUI.cs diff --git a/Tidstagning/MainUI.resx b/MainUI.resx similarity index 100% rename from Tidstagning/MainUI.resx rename to MainUI.resx diff --git a/Tidstagning/Procedure.cs b/Procedure.cs similarity index 97% rename from Tidstagning/Procedure.cs rename to Procedure.cs index f6ead64..20f55b2 100644 --- a/Tidstagning/Procedure.cs +++ b/Procedure.cs @@ -1,7 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Diagnostics; -using System.Threading; +using Timer=System.Threading.Timer; namespace Tidstagning { class Procedure diff --git a/Program.cs b/Program.cs new file mode 100644 index 0000000..eef4b32 --- /dev/null +++ b/Program.cs @@ -0,0 +1,21 @@ +using System; +using System.CommandLine; +using System.Collections.Generic; +using System.Windows.Forms; + +namespace Tidstagning +{ + class Program + { + + [STAThread] + static void Main(string[] args) + { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new MainUI()); + + } + + } +} diff --git a/Tidstagning/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs similarity index 100% rename from Tidstagning/Properties/Settings.Designer.cs rename to Properties/Settings.Designer.cs diff --git a/Tidstagning/Properties/Settings.settings b/Properties/Settings.settings similarity index 100% rename from Tidstagning/Properties/Settings.settings rename to Properties/Settings.settings diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json new file mode 100644 index 0000000..d37f55d --- /dev/null +++ b/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "Tidstagning": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/Tidstagning/Relay.cs b/Relay.cs similarity index 100% rename from Tidstagning/Relay.cs rename to Relay.cs diff --git a/Tidstagning/ResultList.cs b/ResultList.cs similarity index 100% rename from Tidstagning/ResultList.cs rename to ResultList.cs diff --git a/Tidstagning/Settings.Designer.cs b/Settings.Designer.cs similarity index 100% rename from Tidstagning/Settings.Designer.cs rename to Settings.Designer.cs diff --git a/Tidstagning/Settings.cs b/Settings.cs similarity index 100% rename from Tidstagning/Settings.cs rename to Settings.cs diff --git a/Tidstagning.csproj b/Tidstagning.csproj new file mode 100644 index 0000000..e059139 --- /dev/null +++ b/Tidstagning.csproj @@ -0,0 +1,15 @@ + + + + WinExe + net6.0-windows + enable + true + true + + + + + + + \ No newline at end of file diff --git a/Tidstagning.sln b/Tidstagning.sln deleted file mode 100644 index 3c05fae..0000000 --- a/Tidstagning.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31808.319 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tidstagning", "Tidstagning\Tidstagning.csproj", "{5AF4CA7E-39CF-4DB6-BED3-4FDB23BEDE86}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5AF4CA7E-39CF-4DB6-BED3-4FDB23BEDE86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AF4CA7E-39CF-4DB6-BED3-4FDB23BEDE86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AF4CA7E-39CF-4DB6-BED3-4FDB23BEDE86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AF4CA7E-39CF-4DB6-BED3-4FDB23BEDE86}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {FF5491E4-A9E1-4EA9-86F1-3CF119710682} - EndGlobalSection -EndGlobal diff --git a/Tidstagning/Program.cs b/Tidstagning/Program.cs deleted file mode 100644 index 2dd5882..0000000 --- a/Tidstagning/Program.cs +++ /dev/null @@ -1,35 +0,0 @@ -using CommandLine; -using System; -using System.Collections.Generic; -using System.Windows.Forms; - -namespace Tidstagning -{ - class Program - { - public class Options - { - [Option('c', "config", Required = false, HelpText = "Enable configuration menu.")] - public bool Config { get; set; } - } - - [STAThread] - static void Main(string[] args) - { - CommandLine.Parser.Default.ParseArguments(args) - .WithParsed(RunOptions) - .WithNotParsed(HandleParseError); - } - static void RunOptions(Options opts) - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainUI(opts.Config)); - } - static void HandleParseError(IEnumerable errs) - { - MessageBox.Show("Failed to start\n" + errs.ToString()); - } - - } -} diff --git a/Tidstagning/Tidstagning.csproj b/Tidstagning/Tidstagning.csproj deleted file mode 100644 index 55b9fb8..0000000 --- a/Tidstagning/Tidstagning.csproj +++ /dev/null @@ -1,54 +0,0 @@ - - - - WinExe - net6.0-windows - enable - True - disable - Tidstagning.Program - portable - False - none - - - - - True - - - - - True - - - - - - - - - - - - - - True - True - Settings.settings - - - True - True - Settings.settings - - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - \ No newline at end of file diff --git a/Tidstagning/Tidstagning.csproj.user b/Tidstagning/Tidstagning.csproj.user deleted file mode 100644 index 676249f..0000000 --- a/Tidstagning/Tidstagning.csproj.user +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Form - - - Form - - - Form - - - \ No newline at end of file