Bumpup dotnet sdk to 6.0.401

Change-Id: I0e39b40faa39a0d5d6f9096b94c4813725254cf6

diff --git a/build/msbuild.tasks.core.patch b/build/msbuild.tasks.core.patch
index dd95da7..0df96fd 100644 (file)
--- a/build/msbuild.tasks.core.patch
+++ b/build/msbuild.tasks.core.patch
@@ -1,24 +1,24 @@
 diff --git a/src/Tasks/CultureInfoCache.cs b/src/Tasks/CultureInfoCache.cs
-index 853c512dc..331ca107c 100644
+index 6173311..ea61a79 100644
 --- a/src/Tasks/CultureInfoCache.cs
 +++ b/src/Tasks/CultureInfoCache.cs
-@@ -46,6 +46,19 @@ namespace Microsoft.Build.Tasks
-             {
-                 ValidCultureNames.Add(pseudoLocale);
-             }
-+
-+#if !FEATURE_CULTUREINFO_GETCULTURES
-+            // Add locales for Tizen TV
-+            var tizenLocales = new[] {
-+                  "bh-IN", "bhb-IN", "ckb-IQ", "ks-IN", "ku-Arab-IN", "mai-IN", "sat-IN", "sd-IN", "tcy-IN", "tu-IN", "tl-PH" };
-+
-+            ValidCultureNames = HardcodedCultureNames;
-+            foreach (string tizenLocale in tizenLocales)
-+            {
-+                  ValidCultureNames.Add(tizenLocale);
-+            }
-+#endif
-+
-         }
- 
-         /// <summary>
+@@ -916,7 +916,18 @@ namespace Microsoft.Build.Tasks
+             "zu",
+             "zu-ZA",
+             "zh-CHS",
+-            "zh-CHT"
++            "zh-CHT",
++            "bh-IN",
++            "bhb-IN",
++            "ckb-IQ",
++            "ks-IN",
++            "ku-Arab-IN",
++            "mai-IN",
++            "sat-IN",
++            "sd-IN",
++            "tcy-IN",
++            "tu-IN",
++            "tl-PH"
+         };
+ #endif
+     }
\ No newline at end of file

diff --git a/build/prepare_additional_packs.sh b/build/prepare_additional_packs.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/build/prepare_msbuild_overrides.sh b/build/prepare_msbuild_overrides.sh
index 906bfcf..af3ec6b 100755 (executable)
--- a/build/prepare_msbuild_overrides.sh
+++ b/build/prepare_msbuild_overrides.sh
@@ -26,4 +26,4 @@ patch -p1 -d $MSBUILD_GITDIR < $SCRIPT_DIR/msbuild.tasks.core.patch
 $MSBUILD_GITDIR/build.sh --build -c Release --warnAsError false
 
 # Copy Microsoft.Build.Tasks.Core.dll to overrides directory
-cp -v $MSBUILD_GITDIR/artifacts/bin/Microsoft.Build.Tasks/Release/netstandard2.0/Microsoft.Build.Tasks.Core.dll $ROOT_DIR/overrides/
+cp -v $MSBUILD_GITDIR/artifacts/bin/Microsoft.Build.Tasks/Release/net6.0/Microsoft.Build.Tasks.Core.dll $ROOT_DIR/overrides/

diff --git a/build/versions.inc b/build/versions.inc
index b27cf05..70baa1d 100644 (file)
--- a/build/versions.inc
+++ b/build/versions.inc
@@ -1,6 +1,7 @@
-MSBUILD_VERSION_TAG=v17.0.0
+MSBUILD_VERSION_TAG=v17.3.1
 
 ADDITIONAL_FRAMEWORK_PACKS=(
+    "NETStandard.Library.Ref 2.0.3"
     "NETStandard.Library.Ref 2.1.0"
     "Microsoft.NETCore.App.Ref 3.0.0"
     "Microsoft.NETCore.App.Ref 3.1.0"
@@ -9,12 +10,13 @@ ADDITIONAL_FRAMEWORK_PACKS=(
     "Microsoft.AspNetCore.App.Ref 3.1.10"
     "Microsoft.AspNetCore.App.Ref 6.0.9"
     "Microsoft.NETCore.App.Host.linux-x64 3.0.3"
+    "Microsoft.NETCore.App.Host.linux-x64 3.1.0"
     "Microsoft.NETCore.App.Host.linux-x64 3.1.22"
     "Microsoft.NETCore.App.Host.linux-x64 6.0.9"
 )
 
-DOTNET_SDK_VERSION_BAND=6.0.100
-TIZEN_WORKLOAD_VERSION=7.0.101
+DOTNET_SDK_VERSION_BAND=6.0.400
+TIZEN_WORKLOAD_VERSION=7.0.119
 
 TIZEN_WORKLOAD_NUPKGS=(
     "Samsung.NET.Sdk.Tizen.Manifest-${DOTNET_SDK_VERSION_BAND}"
@@ -22,4 +24,4 @@ TIZEN_WORKLOAD_NUPKGS=(
     "Samsung.Tizen.Ref"
     "Samsung.Tizen.Sdk"
     "Samsung.Tizen.Templates"
-)
\ No newline at end of file
+)

diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec
index 253fd23..00e3c87 100644 (file)
--- a/packaging/dotnet-build-tools.spec
+++ b/packaging/dotnet-build-tools.spec
@@ -3,7 +3,7 @@
 
 Name:       dotnet-build-tools
 Summary:    Tools for building C# API projects
-Version:    6.0.101
+Version:    6.0.401
 Release:    1
 Group:      Development/Libraries
 License:    MIT and Apache-2.0

diff --git a/packaging/dotnet-sdk-6.0.101-linux-x64.tar.gz b/packaging/dotnet-sdk-6.0.401-linux-x64.tar.gz
old mode 100644 (file)
new mode 100755 (executable)
similarity index 85%
rename from packaging/dotnet-sdk-6.0.101-linux-x64.tar.gz
rename to packaging/dotnet-sdk-6.0.401-linux-x64.tar.gz
index 91c5b0b..2f5541d
Binary files a/packaging/dotnet-sdk-6.0.101-linux-x64.tar.gz and b/packaging/dotnet-sdk-6.0.401-linux-x64.tar.gz differ