diff --git a/config.mak.uname b/config.mak.uname
index e694c2db4a6b6e..600a90b85506b9 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -769,7 +769,7 @@ vcxproj:
# Make .vcxproj files and add them
perl contrib/buildsystems/generate -g Vcxproj
- git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
+ git add -f git.sln {*,*/lib.proj,t/helper/*}/*.vcxproj
# Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file
(echo '' && \
@@ -779,7 +779,7 @@ vcxproj:
echo ' '; \
done && \
echo ' ' && \
- echo '') >git/LinkOrCopyBuiltins.targets
+ echo '') >git.proj/LinkOrCopyBuiltins.targets
(echo '' && \
echo ' ' && \
for name in $(REMOTE_CURL_ALIASES); \
@@ -787,8 +787,8 @@ vcxproj:
echo ' '; \
done && \
echo ' ' && \
- echo '') >git-remote-http/LinkOrCopyRemoteHttp.targets
- git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
+ echo '') >git-remote-http.proj/LinkOrCopyRemoteHttp.targets
+ git add -f git.proj/LinkOrCopyBuiltins.targets git-remote-http.proj/LinkOrCopyRemoteHttp.targets
# Add generated headers
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index b2e68a16715e39..0439b82f55e243 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -58,8 +58,8 @@ sub createProject {
my $uuid = generate_guid($name);
$$build_structure{"$prefix${target}_GUID"} = $uuid;
my $vcxproj = $target;
- $vcxproj =~ s/(.*\/)?(.*)/$&\/$2.vcxproj/;
- $vcxproj =~ s/([^\/]*)(\/lib)\/(lib.vcxproj)/$1$2\/$1_$3/;
+ $vcxproj =~ s/(.*\/)?(.*)/$&.proj\/$2.vcxproj/;
+ $vcxproj =~ s/([^\/]*)(\/lib\.proj)\/(lib.vcxproj)/$1$2\/$1_$3/;
$$build_structure{"$prefix${target}_VCXPROJ"} = $vcxproj;
my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"$prefix${name}_SOURCES"}}));
@@ -89,7 +89,9 @@ sub createProject {
$defines =~ s/>/>/g;
$defines =~ s/\'//g;
- die "Could not create the directory $target for $label project!\n" unless (-d "$target" || mkdir "$target");
+ my $dir = $vcxproj;
+ $dir =~ s/\/[^\/]*$//;
+ die "Could not create the directory $dir for $label project!\n" unless (-d "$dir" || mkdir "$dir");
open F, ">$vcxproj" or die "Could not open $vcxproj for writing!\n";
binmode F, ":crlf :utf8";
@@ -237,7 +239,7 @@ EOM
print F << "EOM";
-
+
$uuid_libgit
false
@@ -252,7 +254,7 @@ EOM
}
if (!($name =~ 'xdiff')) {
print F << "EOM";
-
+
$uuid_xdiff_lib
false
@@ -261,7 +263,7 @@ EOM
if ($name =~ /(test-(line-buffer|svn-fe)|^git-remote-testsvn)\.exe$/) {
my $uuid_vcs_svn_lib = $$build_structure{"LIBS_vcs-svn/lib_GUID"};
print F << "EOM";
-
+
$uuid_vcs_svn_lib
false
@@ -338,7 +340,7 @@ sub createGlueProject {
my $vcxproj = $build_structure{"APPS_${appname}_VCXPROJ"};
$vcxproj =~ s/\//\\/g;
$appname =~ s/.*\///;
- print F "\"${appname}\", \"${vcxproj}\", \"${uuid}\"";
+ print F "\"${appname}.proj\", \"${vcxproj}\", \"${uuid}\"";
print F "$SLN_POST";
}
foreach (@libs) {
@@ -348,7 +350,7 @@ sub createGlueProject {
my $vcxproj = $build_structure{"LIBS_${libname}_VCXPROJ"};
$vcxproj =~ s/\//\\/g;
$libname =~ s/\//_/g;
- print F "\"${libname}\", \"${vcxproj}\", \"${uuid}\"";
+ print F "\"${libname}.proj\", \"${vcxproj}\", \"${uuid}\"";
print F "$SLN_POST";
}
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 532035933f3326..cc16f1ff7b7106 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -836,8 +836,8 @@ test_expect_success '"remote show" does not show symbolic refs' '
(
cd three &&
git remote show origin >output &&
- ! grep "^ *HEAD$" < output &&
- ! grep -i stale < output
+ ! grep "^ *HEAD$"