From d923a28afb3e6ea8b9f8526da026a2b5dc61c259 Mon Sep 17 00:00:00 2001 From: Recrown Date: Fri, 31 May 2019 00:57:03 -0500 Subject: [PATCH] Transitioned to .Net Standard and use of VSCode. --- .gitignore | 136 +++++++++++++++--- .vscode/launch.json | 27 ++++ .vscode/settings.json | 8 ++ .vscode/tasks.json | 36 +++++ .../RecrownedAthenaeum.Pipeline.csproj | 73 +--------- .../RecrownedAthenaeum.Tools.csproj | 2 +- RecrownedAthenaeum.code-workspace | 14 ++ RecrownedAthenaeum.sln | 43 ------ RecrownedAthenaeum/RecrownedAthenaeum.csproj | 109 +------------- RecrownedAthenaeum/packages.config | 5 - 10 files changed, 217 insertions(+), 236 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json create mode 100644 RecrownedAthenaeum.code-workspace delete mode 100644 RecrownedAthenaeum.sln delete mode 100644 RecrownedAthenaeum/packages.config diff --git a/.gitignore b/.gitignore index 3c4efe2..034fda7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,14 @@ +# Created by https://www.gitignore.io/api/csharp,visualstudiocode +# Edit at https://www.gitignore.io/?templates=csharp,visualstudiocode + +### 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 @@ -10,6 +17,9 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -17,16 +27,21 @@ [Rr]eleases/ x64/ x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ -# Visual Studio 2015 cache/options directory +# 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.* @@ -40,19 +55,28 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX +# 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 -*_i.h +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -62,6 +86,7 @@ artifacts/ *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log *.vspscc *.vssscc @@ -90,6 +115,9 @@ ipch/ *.vspx *.sap +# Visual Studio Trace Files +*.e2e + # TFS 2012 Local Workspace $tf/ @@ -110,6 +138,14 @@ _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 @@ -141,9 +177,9 @@ publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings +# 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 +*.pubxml *.publishproj # Microsoft Azure Web App publish settings. Comment the next line if you want to @@ -154,12 +190,12 @@ PublishScripts/ # NuGet Packages *.nupkg # The packages folder can be ignored because of Package Restore -**/packages/* +**/[Pp]ackages/* # except build/, which is used as an MSBuild target. -!**/packages/build/ +!**/[Pp]ackages/build/ # Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files *.nuget.props *.nuget.targets @@ -176,12 +212,15 @@ 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/ +!?*.[Cc]ache/ # Others ClientBin/ @@ -192,9 +231,12 @@ ClientBin/ *.jfm *.pfx *.publishsettings -node_modules/ 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/ @@ -209,15 +251,20 @@ _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 +*- Backup*.rdl # Microsoft Fakes FakesAssemblies/ @@ -227,6 +274,7 @@ FakesAssemblies/ # Node.js Tools for Visual Studio .ntvs_analysis.dat +node_modules/ # Visual Studio 6 build log *.plg @@ -234,6 +282,9 @@ FakesAssemblies/ # 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 @@ -249,13 +300,62 @@ paket-files/ # FAKE - F# Make .fake/ -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ +# CodeRush personal settings +.cr/personal # Python Tools for Visual Studio (PTVS) __pycache__/ -*.pyc \ No newline at end of file +*.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/ + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history + +# End of https://www.gitignore.io/api/csharp,visualstudiocode \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..61bfa58 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,27 @@ +{ + // 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": ".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}/RecrownedAthenaeum.Tools/bin/Debug/netcoreapp2.1/RecrownedAthenaeum.Tools.dll", + "args": [], + "cwd": "${workspaceFolder}/RecrownedAthenaeum.Tools", + // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window + "console": "internalConsole", + "stopAtEntry": false + }, + { + "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..2421e38 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "files.exclude": { + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true + } +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..fe38c82 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,36 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj" + ], + "problemMatcher": "$tsc" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj" + ], + "problemMatcher": "$tsc" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "${workspaceFolder}/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj" + ], + "problemMatcher": "$tsc" + } + ] +} \ No newline at end of file diff --git a/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj b/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj index 10329cf..fe52726 100644 --- a/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj +++ b/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj @@ -1,73 +1,14 @@ - - - + - Debug - AnyCPU - {B38F9812-B1D1-4BFE-89EE-FC4DD4EBAA3F} - Library - Properties - RecrownedAthenaeum.Pipeline - RecrownedAthenaeum.Pipeline - v4.5 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\RecrownedAthenaeum.Pipeline.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\RecrownedAthenaeum.Pipeline.xml + netstandard2.0 + + false - - ..\packages\MonoGame.Framework.Portable.3.7.1.189\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll - - - ..\packages\MonoGame.Framework.Content.Pipeline.Portable.3.7.1.189\lib\portable-net45+win8+wpa81\MonoGame.Framework.Content.Pipeline.dll - - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - - - + + - - - - - - - + - - - - - - {95a926dc-1482-4368-91da-8d30ac04740a} - RecrownedAthenaeum - - - \ No newline at end of file diff --git a/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj b/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj index fd7a355..4bbfc11 100644 --- a/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj +++ b/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj @@ -14,7 +14,7 @@ - + diff --git a/RecrownedAthenaeum.code-workspace b/RecrownedAthenaeum.code-workspace new file mode 100644 index 0000000..f679b6e --- /dev/null +++ b/RecrownedAthenaeum.code-workspace @@ -0,0 +1,14 @@ +{ + "folders": [ + { + "path": "RecrownedAthenaeum" + }, + { + "path": "RecrownedAthenaeum.Pipeline" + }, + { + "path": "RecrownedAthenaeum.Tools" + } + ], + "settings": {} +} \ No newline at end of file diff --git a/RecrownedAthenaeum.sln b/RecrownedAthenaeum.sln deleted file mode 100644 index 36dff34..0000000 --- a/RecrownedAthenaeum.sln +++ /dev/null @@ -1,43 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.136 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecrownedAthenaeum", "RecrownedAthenaeum\RecrownedAthenaeum.csproj", "{95A926DC-1482-4368-91DA-8D30AC04740A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecrownedAthenaeum.Pipeline", "RecrownedAthenaeum.Pipeline\RecrownedAthenaeum.Pipeline.csproj", "{B38F9812-B1D1-4BFE-89EE-FC4DD4EBAA3F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RecrownedAthenaeum.Tools", "RecrownedAthenaeum.Tools\RecrownedAthenaeum.Tools.csproj", "{51E77E29-AD31-449E-9C98-980E5C978EF9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGame", "TestGame\TestGame.csproj", "{BA487AFA-D973-4FC6-BA6D-D2E639AD3094}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {95A926DC-1482-4368-91DA-8D30AC04740A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95A926DC-1482-4368-91DA-8D30AC04740A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95A926DC-1482-4368-91DA-8D30AC04740A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95A926DC-1482-4368-91DA-8D30AC04740A}.Release|Any CPU.Build.0 = Release|Any CPU - {B38F9812-B1D1-4BFE-89EE-FC4DD4EBAA3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B38F9812-B1D1-4BFE-89EE-FC4DD4EBAA3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B38F9812-B1D1-4BFE-89EE-FC4DD4EBAA3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B38F9812-B1D1-4BFE-89EE-FC4DD4EBAA3F}.Release|Any CPU.Build.0 = Release|Any CPU - {51E77E29-AD31-449E-9C98-980E5C978EF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51E77E29-AD31-449E-9C98-980E5C978EF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51E77E29-AD31-449E-9C98-980E5C978EF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51E77E29-AD31-449E-9C98-980E5C978EF9}.Release|Any CPU.Build.0 = Release|Any CPU - {BA487AFA-D973-4FC6-BA6D-D2E639AD3094}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA487AFA-D973-4FC6-BA6D-D2E639AD3094}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA487AFA-D973-4FC6-BA6D-D2E639AD3094}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA487AFA-D973-4FC6-BA6D-D2E639AD3094}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F587196A-FFAC-4364-AA68-8DC62B17732F} - EndGlobalSection -EndGlobal diff --git a/RecrownedAthenaeum/RecrownedAthenaeum.csproj b/RecrownedAthenaeum/RecrownedAthenaeum.csproj index 9b14c2e..d0341f2 100644 --- a/RecrownedAthenaeum/RecrownedAthenaeum.csproj +++ b/RecrownedAthenaeum/RecrownedAthenaeum.csproj @@ -1,108 +1,11 @@ - - - + - Debug - AnyCPU - {95A926DC-1482-4368-91DA-8D30AC04740A} - Library - Properties - RecrownedAthenaeum - RecrownedAthenaeum - v4.5 - 512 - true - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\RecrownedAthenaeum.xml - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\RecrownedAthenaeum.xml + netstandard2.0 + + false - - ..\packages\MonoGame.Framework.Portable.3.7.1.189\lib\portable-net45+win8+wpa81\MonoGame.Framework.dll - - - ..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RecrownedAthenaeum/packages.config b/RecrownedAthenaeum/packages.config deleted file mode 100644 index 95d697f..0000000 --- a/RecrownedAthenaeum/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file