From 03e94559e9118479c9df3c283c94d8cb566af55f Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Fri, 6 Dec 2019 11:40:02 +0100
Subject: [PATCH] Rename directory with Visual Studio solution

Name 'visualc_net' invokes old names for Visual Studio
(Visual Studio .NET 2002 or 2003), which has no relation to content of
this subdirectory.

Also, by renaming this directory we mitigate chance, that during
merge-in from svn/trunk git will automatically inject some values from
from upstream, incompatible version of solution files. By sheer
luck this might happen without causing a conflict. Never happened so
far, but there's no point in risking it.
---
 .github/workflows/dormant/windows.yml | 4 ++--
 .github/workflows/windows.yml         | 2 +-
 Makefile.am                           | 2 +-
 README.md                             | 4 ++--
 configure.ac                          | 2 +-
 {visualc_net => vs}/.gitignore        | 0
 {visualc_net => vs}/Makefile.am       | 0
 {visualc_net => vs}/dosbox.sln        | 0
 {visualc_net => vs}/dosbox.vcxproj    | 0
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename {visualc_net => vs}/.gitignore (100%)
 rename {visualc_net => vs}/Makefile.am (100%)
 rename {visualc_net => vs}/dosbox.sln (100%)
 rename {visualc_net => vs}/dosbox.vcxproj (100%)

diff --git a/.github/workflows/dormant/windows.yml b/.github/workflows/dormant/windows.yml
index 3b74cc43..c60f34be 100644
--- a/.github/workflows/dormant/windows.yml
+++ b/.github/workflows/dormant/windows.yml
@@ -30,14 +30,14 @@ jobs:
         env:
           PATH: '${env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64'
         run: |
-          cd visualc_net
+          cd vs
           MSBuild -m dosbox.sln -p:Configuration=Release
       - name:  Debug build
         shell: pwsh
         env:
           PATH: '${env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64'
         run: |
-          cd visualc_net
+          cd vs
           MSBuild -m dosbox.sln -p:Configuration=Debug
 
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index b92b1c99..b42760a1 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           PATH: '${env:PATH};C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64'
         run: |
-          cd visualc_net
+          cd vs
           MSBuild -m dosbox.sln -p:Configuration=${{ matrix.type }}
 
 
diff --git a/Makefile.am b/Makefile.am
index b8408129..fb337ed5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Main Makefile for DOSBox
 
 EXTRA_DIST = autogen.sh
-SUBDIRS = src include docs visualc_net
+SUBDIRS = src include docs vs
 
 # Per the auto-tools clean guidelines:
 # https://www.gnu.org/savannah-checkouts/gnu/automake/manual/html_node/Clean.html#Clean
diff --git a/README.md b/README.md
index e6fc3b77..50644fb6 100644
--- a/README.md
+++ b/README.md
@@ -104,8 +104,8 @@ PowerShell, and run:
 
 These two steps will ensure that MSVC finds and links all dependencies.
 
-Start Visual Studio, open file: `visualc_net\dosbox.sln` and build all
-projects (Ctrl+Shift+B).
+Start Visual Studio, open file: `vs\dosbox.sln` and build all projects
+(Ctrl+Shift+B).
 
 
 ## Interop with SVN
diff --git a/configure.ac b/configure.ac
index e291acf8..06fe76b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -646,7 +646,7 @@ src/misc/Makefile
 src/shell/Makefile
 src/platform/Makefile
 src/platform/visualc/Makefile
-visualc_net/Makefile
+vs/Makefile
 include/Makefile
 docs/Makefile
 ])
diff --git a/visualc_net/.gitignore b/vs/.gitignore
similarity index 100%
rename from visualc_net/.gitignore
rename to vs/.gitignore
diff --git a/visualc_net/Makefile.am b/vs/Makefile.am
similarity index 100%
rename from visualc_net/Makefile.am
rename to vs/Makefile.am
diff --git a/visualc_net/dosbox.sln b/vs/dosbox.sln
similarity index 100%
rename from visualc_net/dosbox.sln
rename to vs/dosbox.sln
diff --git a/visualc_net/dosbox.vcxproj b/vs/dosbox.vcxproj
similarity index 100%
rename from visualc_net/dosbox.vcxproj
rename to vs/dosbox.vcxproj