From 2ec651108d3be00fdcdca8bd7361b618994b694e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 28 Dec 2017 11:35:20 +0100 Subject: [PATCH 1/3] DPI awareness enabled --- SAM.API/Properties/app.manifest | 32 ++++++++++++++++++++++++++++++ SAM.API/SAM.API.csproj | 6 ++++++ SAM.Game/Properties/app.manifest | 32 ++++++++++++++++++++++++++++++ SAM.Game/SAM.Game.csproj | 4 ++++ SAM.Picker/Properties/app.manifest | 32 ++++++++++++++++++++++++++++++ SAM.Picker/SAM.Picker.csproj | 4 ++++ 6 files changed, 110 insertions(+) create mode 100644 SAM.API/Properties/app.manifest create mode 100644 SAM.Game/Properties/app.manifest create mode 100644 SAM.Picker/Properties/app.manifest diff --git a/SAM.API/Properties/app.manifest b/SAM.API/Properties/app.manifest new file mode 100644 index 0000000..4d9b8b4 --- /dev/null +++ b/SAM.API/Properties/app.manifest @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + diff --git a/SAM.API/SAM.API.csproj b/SAM.API/SAM.API.csproj index cd2d0f7..5e21799 100644 --- a/SAM.API/SAM.API.csproj +++ b/SAM.API/SAM.API.csproj @@ -54,6 +54,9 @@ AllRules.ruleset true + + Properties\app.manifest + @@ -121,6 +124,9 @@ true + + + + + + + + + + + + + + + + + true + + + diff --git a/SAM.Game/SAM.Game.csproj b/SAM.Game/SAM.Game.csproj index 15f0ca6..45908cf 100644 --- a/SAM.Game/SAM.Game.csproj +++ b/SAM.Game/SAM.Game.csproj @@ -52,6 +52,9 @@ x86 AllRules.ruleset + + Properties\app.manifest + @@ -146,6 +149,7 @@ + + + + + + + + + + + + + + + true + + + diff --git a/SAM.Picker/SAM.Picker.csproj b/SAM.Picker/SAM.Picker.csproj index 4fa52ce..73572c4 100644 --- a/SAM.Picker/SAM.Picker.csproj +++ b/SAM.Picker/SAM.Picker.csproj @@ -56,6 +56,9 @@ x86 AllRules.ruleset + + Properties\app.manifest + @@ -110,6 +113,7 @@ + From 23baee2f6f0d324b80d325089c13fe7f7ab00164 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 28 Dec 2017 11:37:02 +0100 Subject: [PATCH 2/3] Added gitattributes and updated gitignore --- .gitattributes | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ .gitignore | 16 +++++++++---- 2 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 406bbe6..3c4efe2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ *.user *.userosscache *.sln.docstates -private/ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs @@ -20,10 +19,8 @@ x64/ x86/ bld/ [Bb]in/ -[Bb]in_*/ [Oo]bj/ [Ll]og/ -[Uu]pload/ # Visual Studio 2015 cache/options directory .vs/ @@ -45,6 +42,7 @@ dlldata.c # DNX project.lock.json +project.fragment.lock.json artifacts/ *_i.c @@ -145,7 +143,7 @@ publish/ *.azurePubxml # TODO: 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 @@ -191,6 +189,7 @@ ClientBin/ *~ *.dbmdl *.dbproj.schemaview +*.jfm *.pfx *.publishsettings node_modules/ @@ -252,4 +251,11 @@ paket-files/ # JetBrains Rider .idea/ -*.sln.iml \ No newline at end of file +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc \ No newline at end of file From 4f63d664f8891df3e1cd85c96c4e27e55581d955 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 28 Dec 2017 12:06:43 +0100 Subject: [PATCH 3/3] Updated gitignore after request --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3c4efe2..cb3ad47 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ *.user *.userosscache *.sln.docstates +private/ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs