From f26a392a97b315251600fdce77159791b766f68d Mon Sep 17 00:00:00 2001 From: petris Date: Fri, 5 Jun 2020 23:16:11 +0200 Subject: [PATCH 1/6] Convert to new project style --- .gitignore | 155 ++---- MultiAdmin.Tests/MultiAdmin.Tests.csproj | 22 + .../Properties/AssemblyInfo.cs | 0 .../ServerIO/ShiftingListTests.cs | 0 .../ServerIO/StringSectionsTests.cs | 0 .../Utility/StringExtensionsTests.cs | 0 .../Utility/UtilsTests.cs | 0 MultiAdmin.sln | 50 +- MultiAdmin/MultiAdmin.csproj | 129 +---- MultiAdminTests/.gitignore | 516 ------------------ MultiAdminTests/MultiAdminTests.csproj | 101 ---- 11 files changed, 97 insertions(+), 876 deletions(-) create mode 100644 MultiAdmin.Tests/MultiAdmin.Tests.csproj rename {MultiAdminTests => MultiAdmin.Tests}/Properties/AssemblyInfo.cs (100%) rename {MultiAdminTests => MultiAdmin.Tests}/ServerIO/ShiftingListTests.cs (100%) rename {MultiAdminTests => MultiAdmin.Tests}/ServerIO/StringSectionsTests.cs (100%) rename {MultiAdminTests => MultiAdmin.Tests}/Utility/StringExtensionsTests.cs (100%) rename {MultiAdminTests => MultiAdmin.Tests}/Utility/UtilsTests.cs (100%) delete mode 100644 MultiAdminTests/.gitignore delete mode 100644 MultiAdminTests/MultiAdminTests.csproj diff --git a/.gitignore b/.gitignore index 1579cdd..12a2548 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ - -# Created by https://www.gitignore.io/api/git,rider,linux,macos,csharp,windows,monodevelop -# Edit at https://www.gitignore.io/?templates=git,rider,linux,macos,csharp,windows,monodevelop - -### Csharp ### ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## @@ -47,10 +42,9 @@ Generated\ Files/ [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* -# NUnit +# NUNIT *.VisualState.xml TestResult.xml -nunit-*.xml # Build Results of an ATL Project [Dd]ebugPS/ @@ -73,6 +67,7 @@ StyleCopReport.xml *_p.c *_h.h *.ilk +*.meta *.obj *.iobj *.pch @@ -190,8 +185,6 @@ 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. @@ -267,9 +260,7 @@ ServiceFabricBackup/ *.bim.layout *.bim_*.settings *.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl +*- Backup*.rdl # Microsoft Fakes FakesAssemblies/ @@ -352,36 +343,29 @@ healthchecksdb # Backup folder for Package Reference Convert tool in Visual Studio 2017 MigrationBackup/ -### Git ### -# Created by git for backups. To disable backups in Git: -# $ git config --global mergetool.keepBackup false -*.orig - -# Created by git when using merge tools for conflicts -*.BACKUP.* -*.BASE.* -*.LOCAL.* -*.REMOTE.* -*_BACKUP_*.txt -*_BASE_*.txt -*_LOCAL_*.txt -*_REMOTE_*.txt - -### Linux ### - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* +## +## Visual studio for Mac +## -# KDE directory preferences -.directory -# Linux trash folder which might appear on any partition or disk -.Trash-* +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ -# .nfs files are created when an open file is removed but is still being accessed -.nfs* +# Mac bundle stuff +*.dmg +*.app -### macOS ### +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore # General .DS_Store .AppleDouble @@ -390,6 +374,7 @@ MigrationBackup/ # Icon must end with two \r Icon + # Thumbnails ._* @@ -409,88 +394,9 @@ Network Trash Folder Temporary Items .apdisk -### MonoDevelop ### -#User Specific -*.usertasks - -#Mono Project Files -*.resources -test-results/ - -### Rider ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### Windows ### +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore # Windows thumbnail cache files Thumbs.db -Thumbs.db:encryptable ehthumbs.db ehthumbs_vista.db @@ -513,4 +419,15 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk -# End of https://www.gitignore.io/api/git,rider,linux,macos,csharp,windows,monodevelop +# JetBrains Rider +.idea/ +*.sln.iml + +## +## Visual Studio Code +## +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json diff --git a/MultiAdmin.Tests/MultiAdmin.Tests.csproj b/MultiAdmin.Tests/MultiAdmin.Tests.csproj new file mode 100644 index 0000000..acd871b --- /dev/null +++ b/MultiAdmin.Tests/MultiAdmin.Tests.csproj @@ -0,0 +1,22 @@ + + + net472 + false + false + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/MultiAdminTests/Properties/AssemblyInfo.cs b/MultiAdmin.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from MultiAdminTests/Properties/AssemblyInfo.cs rename to MultiAdmin.Tests/Properties/AssemblyInfo.cs diff --git a/MultiAdminTests/ServerIO/ShiftingListTests.cs b/MultiAdmin.Tests/ServerIO/ShiftingListTests.cs similarity index 100% rename from MultiAdminTests/ServerIO/ShiftingListTests.cs rename to MultiAdmin.Tests/ServerIO/ShiftingListTests.cs diff --git a/MultiAdminTests/ServerIO/StringSectionsTests.cs b/MultiAdmin.Tests/ServerIO/StringSectionsTests.cs similarity index 100% rename from MultiAdminTests/ServerIO/StringSectionsTests.cs rename to MultiAdmin.Tests/ServerIO/StringSectionsTests.cs diff --git a/MultiAdminTests/Utility/StringExtensionsTests.cs b/MultiAdmin.Tests/Utility/StringExtensionsTests.cs similarity index 100% rename from MultiAdminTests/Utility/StringExtensionsTests.cs rename to MultiAdmin.Tests/Utility/StringExtensionsTests.cs diff --git a/MultiAdminTests/Utility/UtilsTests.cs b/MultiAdmin.Tests/Utility/UtilsTests.cs similarity index 100% rename from MultiAdminTests/Utility/UtilsTests.cs rename to MultiAdmin.Tests/Utility/UtilsTests.cs diff --git a/MultiAdmin.sln b/MultiAdmin.sln index 2c2a669..692e8c1 100644 --- a/MultiAdmin.sln +++ b/MultiAdmin.sln @@ -1,30 +1,48 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2026 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiAdmin", "MultiAdmin\MultiAdmin.csproj", "{8384BF3C-5FC8-4395-A3DE-440C6C531D36}" +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiAdmin", "MultiAdmin\MultiAdmin.csproj", "{457C38EC-1251-4FEA-80D9-2EA10BD18A35}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiAdminTests", "MultiAdminTests\MultiAdminTests.csproj", "{D56F8899-C7BB-4ADE-A62C-DEC4DC8C2EE8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiAdmin.Tests", "MultiAdmin.Tests\MultiAdmin.Tests.csproj", "{314971BB-616B-4FAE-B375-5A4A670D8626}" 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 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8384BF3C-5FC8-4395-A3DE-440C6C531D36}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {8384BF3C-5FC8-4395-A3DE-440C6C531D36}.Debug|Any CPU.Build.0 = Release|Any CPU - {8384BF3C-5FC8-4395-A3DE-440C6C531D36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8384BF3C-5FC8-4395-A3DE-440C6C531D36}.Release|Any CPU.Build.0 = Release|Any CPU - {D56F8899-C7BB-4ADE-A62C-DEC4DC8C2EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D56F8899-C7BB-4ADE-A62C-DEC4DC8C2EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D56F8899-C7BB-4ADE-A62C-DEC4DC8C2EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D56F8899-C7BB-4ADE-A62C-DEC4DC8C2EE8}.Release|Any CPU.Build.0 = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {07CC5FC6-4DFB-4CA5-9B8B-17B36431B6C9} + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Debug|Any CPU.Build.0 = Debug|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Debug|x64.ActiveCfg = Debug|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Debug|x64.Build.0 = Debug|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Debug|x86.ActiveCfg = Debug|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Debug|x86.Build.0 = Debug|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Release|Any CPU.ActiveCfg = Release|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Release|Any CPU.Build.0 = Release|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Release|x64.ActiveCfg = Release|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Release|x64.Build.0 = Release|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Release|x86.ActiveCfg = Release|Any CPU + {457C38EC-1251-4FEA-80D9-2EA10BD18A35}.Release|x86.Build.0 = Release|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Debug|Any CPU.Build.0 = Debug|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Debug|x64.ActiveCfg = Debug|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Debug|x64.Build.0 = Debug|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Debug|x86.ActiveCfg = Debug|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Debug|x86.Build.0 = Debug|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Release|Any CPU.ActiveCfg = Release|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Release|Any CPU.Build.0 = Release|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Release|x64.ActiveCfg = Release|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Release|x64.Build.0 = Release|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Release|x86.ActiveCfg = Release|Any CPU + {314971BB-616B-4FAE-B375-5A4A670D8626}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/MultiAdmin/MultiAdmin.csproj b/MultiAdmin/MultiAdmin.csproj index 497eb92..afde925 100644 --- a/MultiAdmin/MultiAdmin.csproj +++ b/MultiAdmin/MultiAdmin.csproj @@ -1,129 +1,10 @@ - - + - Debug - AnyCPU - {8384BF3C-5FC8-4395-A3DE-440C6C531D36} Exe - MultiAdmin - v4.7.1 - 512 - MultiAdmin - - false - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 3.0.0.0 - false - true + net472 + false - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - latest - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - latest - - - MultiAdmin.Program - - - Icon.ico - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4.7.1 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4.0.0 - - - + - - \ No newline at end of file + diff --git a/MultiAdminTests/.gitignore b/MultiAdminTests/.gitignore deleted file mode 100644 index 1579cdd..0000000 --- a/MultiAdminTests/.gitignore +++ /dev/null @@ -1,516 +0,0 @@ - -# Created by https://www.gitignore.io/api/git,rider,linux,macos,csharp,windows,monodevelop -# Edit at https://www.gitignore.io/?templates=git,rider,linux,macos,csharp,windows,monodevelop - -### Csharp ### -## 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/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# 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/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.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 - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# 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/ - -### Git ### -# Created by git for backups. To disable backups in Git: -# $ git config --global mergetool.keepBackup false -*.orig - -# Created by git when using merge tools for conflicts -*.BACKUP.* -*.BASE.* -*.LOCAL.* -*.REMOTE.* -*_BACKUP_*.txt -*_BASE_*.txt -*_LOCAL_*.txt -*_REMOTE_*.txt - -### Linux ### - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -### macOS ### -# 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 - -### MonoDevelop ### -#User Specific -*.usertasks - -#Mono Project Files -*.resources -test-results/ - -### Rider ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser - -### Windows ### -# Windows thumbnail cache files -Thumbs.db -Thumbs.db:encryptable -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 - -# End of https://www.gitignore.io/api/git,rider,linux,macos,csharp,windows,monodevelop diff --git a/MultiAdminTests/MultiAdminTests.csproj b/MultiAdminTests/MultiAdminTests.csproj deleted file mode 100644 index daf551b..0000000 --- a/MultiAdminTests/MultiAdminTests.csproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - Debug - AnyCPU - {D56F8899-C7BB-4ADE-A62C-DEC4DC8C2EE8} - Library - Properties - MultiAdminTests - MultiAdminTests - v4.7.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - {8384BF3C-5FC8-4395-A3DE-440C6C531D36} - MultiAdmin - - - - - 2.4.1 - - - 2.4.1 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - False - - - False - - - False - - - False - - - - - - - - \ No newline at end of file From f903318764fa199ef2f25f2d7ad30f1cc1add0df Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Fri, 5 Jun 2020 23:24:09 +0200 Subject: [PATCH 2/6] Update main.yml --- .github/workflows/main.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 06fc9fb..20aab25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,11 +2,7 @@ name: MultiAdmin Build # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the master branch -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: [push, pull_request] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -18,14 +14,21 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.2.0 - # Runs a set of commands using the runners shell - - name: Build MultiAdmin using Visual Studio - shell: cmd - run: | - call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/Common7/Tools/VsMSBuildCmd.bat" - msbuild "%GITHUB_WORKSPACE%" /p:Configuration=Release /t:MultiAdmin:Rebuild /p:OutputPath="%GITHUB_WORKSPACE%/Release" /restore + - name: Setup .NET Core + uses: actions/setup-dotnet@v1.5.0 + with: + dotnet-version: '3.1' + + - name: Install dependencies + run: dotnet restore + + - name: Build MultiAdmin + run: dotnet publish -c release + + - name: Test MultiAdmin + run: dotnet test - name: Upload a Build Artifact uses: actions/upload-artifact@v2.0.1 @@ -33,4 +36,4 @@ jobs: # Artifact name name: MultiAdmin # A file, directory or wildcard pattern that describes what to upload - path: ${{github.workspace}}/Release + path: ${{github.workspace}}/bin/Release/net472/publish From 746214569ccab1ee04ec95d0ccd00b285a1e29b6 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Fri, 5 Jun 2020 23:27:35 +0200 Subject: [PATCH 3/6] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20aab25..4cc9779 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,4 +36,4 @@ jobs: # Artifact name name: MultiAdmin # A file, directory or wildcard pattern that describes what to upload - path: ${{github.workspace}}/bin/Release/net472/publish + path: ${{github.workspace}}\MultiAdmin\bin\Release\net472\publish From 441c4971760350f4f59be4d518b541839c08b1ae Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Fri, 5 Jun 2020 23:51:33 +0200 Subject: [PATCH 4/6] Update MultiAdmin.csproj --- MultiAdmin/MultiAdmin.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/MultiAdmin/MultiAdmin.csproj b/MultiAdmin/MultiAdmin.csproj index afde925..f7a6d4f 100644 --- a/MultiAdmin/MultiAdmin.csproj +++ b/MultiAdmin/MultiAdmin.csproj @@ -3,6 +3,7 @@ Exe net472 false + Icon.ico From 61f61d75afba70cd21760618ddab65366c6ddb12 Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Sat, 6 Jun 2020 00:09:19 +0200 Subject: [PATCH 5/6] Update MultiAdmin.Tests.csproj --- MultiAdmin.Tests/MultiAdmin.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/MultiAdmin.Tests/MultiAdmin.Tests.csproj b/MultiAdmin.Tests/MultiAdmin.Tests.csproj index acd871b..f55dd7a 100644 --- a/MultiAdmin.Tests/MultiAdmin.Tests.csproj +++ b/MultiAdmin.Tests/MultiAdmin.Tests.csproj @@ -3,6 +3,7 @@ net472 false false + MultiAdmin.Tests From bf5eacadb689a540fb1a63be386e03ad439be82c Mon Sep 17 00:00:00 2001 From: MichalPetryka <35800402+MichalPetryka@users.noreply.github.com> Date: Sat, 6 Jun 2020 00:09:40 +0200 Subject: [PATCH 6/6] Update MultiAdmin.csproj --- MultiAdmin/MultiAdmin.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/MultiAdmin/MultiAdmin.csproj b/MultiAdmin/MultiAdmin.csproj index f7a6d4f..14409fd 100644 --- a/MultiAdmin/MultiAdmin.csproj +++ b/MultiAdmin/MultiAdmin.csproj @@ -4,6 +4,7 @@ net472 false Icon.ico + MultiAdmin