From 42257c06e2dfe89af03a5e15b4181aeb7d9727b9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 27 Oct 2021 14:28:48 -0700 Subject: [PATCH 1/7] Update branding for 6.0.2xx --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1d77f37f..3a5fbcb6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,10 +7,10 @@ 6 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 161470b83ecc0d7311ce756c93191e19d802dbd9 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 27 Oct 2021 14:45:09 -0700 Subject: [PATCH 2/7] Set StabilizePackageVersion to false --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3a5fbcb6f..33b333364 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From a157e0ab4279c192e8980a6c20dc51c49d4be8c0 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 29 Oct 2021 16:05:17 -0700 Subject: [PATCH 3/7] Set ulimit --- run-build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/run-build.sh b/run-build.sh index 7b98aedc0..99a408cf2 100755 --- a/run-build.sh +++ b/run-build.sh @@ -25,6 +25,9 @@ CUSTOM_BUILD_ARGS= # Set nuget package cache under the repo [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages" +# Set max number of files open, helps avoid errors during NuGet restore +ulimit -n 16384 + args=( ) while [[ $# > 0 ]]; do From 82334c7ef0439ecebfab3f344cc34f562acc8a05 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 1 Nov 2021 11:21:40 -0700 Subject: [PATCH 4/7] Run build under sudo so that we can set ulimit --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7ff647c40..5eb32b4c7 100755 --- a/build.sh +++ b/build.sh @@ -53,5 +53,5 @@ dockerbuild() if [ ! -z "$BUILD_IN_DOCKER" ]; then dockerbuild $args else - $DIR/run-build.sh $args + sudo $DIR/run-build.sh $args fi From cf3fff796a40b796f01c5ebae988e23d4c4db691 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 1 Nov 2021 14:00:59 -0700 Subject: [PATCH 5/7] Switch prerelease label to preview --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 33b333364..8b6a478c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - servicing + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From e5cb4120c2f1b7f0483db0692810cf05fa8b5f8b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 4 Nov 2021 11:36:49 -0700 Subject: [PATCH 6/7] Update bundle.thm --- src/redist/targets/packaging/windows/clisdk/bundle.thm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.thm b/src/redist/targets/packaging/windows/clisdk/bundle.thm index 89cf63055..568f89f7e 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.thm +++ b/src/redist/targets/packaging/windows/clisdk/bundle.thm @@ -40,8 +40,8 @@ #(loc.FilesInUseLabel) - - + + From dbb47fa43aaf9c3f8605a7ba0a8d0787227a9122 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 5 Nov 2021 16:06:27 -0700 Subject: [PATCH 7/7] Update bundle.thm --- src/redist/targets/packaging/windows/clisdk/bundle.thm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.thm b/src/redist/targets/packaging/windows/clisdk/bundle.thm index 568f89f7e..ebe591ccc 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.thm +++ b/src/redist/targets/packaging/windows/clisdk/bundle.thm @@ -40,8 +40,8 @@ #(loc.FilesInUseLabel) - - + +