From b25bb95a160de0889e4f19c6a11fe5060c3d1047 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 23 Feb 2022 13:53:02 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/xamarin/xamarin-android build main-5d2bc5eded8442da5baf35ee67bf4f719b8d466f-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.95 -> To Version 31.0.200-preview.14.97 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d5c1bc..e3b1203 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6dd808ff7ae62512330d2f111eb1f60f1ae40125 - + https://github.com/xamarin/xamarin-android - 0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067 + 5d2bc5eded8442da5baf35ee67bf4f719b8d466f https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 30978b2..ba12628 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6.0.2 - 31.0.200-preview.14.95 + 31.0.200-preview.14.97 15.2.302-preview.14.40 15.2.302-preview.14.40 From f13dd6fa8e88f7b7bf6840d1f3d568de57638be1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 24 Feb 2022 13:48:46 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/xamarin/xamarin-android build main-4fb6056c555c3f293c068740e7a10a1be5de784c-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.95 -> To Version 31.0.200-preview.14.99 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3b1203..f034260 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6dd808ff7ae62512330d2f111eb1f60f1ae40125 - + https://github.com/xamarin/xamarin-android - 5d2bc5eded8442da5baf35ee67bf4f719b8d466f + 4fb6056c555c3f293c068740e7a10a1be5de784c https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index ba12628..4258a3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6.0.2 - 31.0.200-preview.14.97 + 31.0.200-preview.14.99 15.2.302-preview.14.40 15.2.302-preview.14.40 From 4f358593c3f2d10f92497266f39599945df6367a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Feb 2022 13:47:41 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/xamarin/xamarin-android build main-b3cb3a9e49bbffed4fd00f716ce04ab502396fae-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.95 -> To Version 31.0.200-preview.14.104 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 6.0.3 -> To Version 6.0.3 (parent: Microsoft.Android.Sdk.Windows --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6fdcba2..c1db397 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f034260..ecb2b26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,11 +6,11 @@ https://github.com/dotnet/runtime - 6dd808ff7ae62512330d2f111eb1f60f1ae40125 + 3ba4b3f4eb0b5e25d3901090f921c88055cac1b0 - + https://github.com/xamarin/xamarin-android - 4fb6056c555c3f293c068740e7a10a1be5de784c + b3cb3a9e49bbffed4fd00f716ce04ab502396fae https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 4258a3b..17e0452 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6.0.2 - 31.0.200-preview.14.99 + 31.0.200-preview.14.104 15.2.302-preview.14.40 15.2.302-preview.14.40 From b115ba975b3016a8d7c8b9b7c7c7df168b839353 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Mar 2022 13:40:09 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/xamarin/xamarin-android build main-c71dfe6705d8f2edd8c2c7d75a46ed4797d84982-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.95 -> To Version 31.0.200-preview.14.106 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.200-rtm.22107.3 -> To Version 6.0.300-preview.22128.2 (parent: Microsoft.Android.Sdk.Windows --- NuGet.config | 1 + eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index c1db397..4dbcf45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecb2b26..6a07f0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - c506cfba13ac8861afdaaeadacb34fe7f54cde88 + 2ea9c6a34e055586b6435d7dca837dd01def4f2a https://github.com/dotnet/runtime 3ba4b3f4eb0b5e25d3901090f921c88055cac1b0 - + https://github.com/xamarin/xamarin-android - b3cb3a9e49bbffed4fd00f716ce04ab502396fae + c71dfe6705d8f2edd8c2c7d75a46ed4797d84982 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 17e0452..2d1e9d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,13 +2,13 @@ - 6.0.200-rtm.22107.3 + 6.0.300-preview.22128.2 6.0.3 6.0.2 - 31.0.200-preview.14.104 + 31.0.200-preview.14.106 15.2.302-preview.14.40 15.2.302-preview.14.40 From 6e25fe2f6d7dbae7ba106e2095c958837d396e99 Mon Sep 17 00:00:00 2001 From: redth Date: Tue, 1 Mar 2022 16:32:32 -0500 Subject: [PATCH 5/6] Try pinning sdk to 200 to build --- global.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/global.json b/global.json index ca53f9b..47111a5 100644 --- a/global.json +++ b/global.json @@ -1,4 +1,7 @@ { + "sdk": { + "version": "6.0.200" + }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.23", "Microsoft.Build.NoTargets": "2.0.1" From d6c702777d8a5676d2c6471dc28867dc21e96b95 Mon Sep 17 00:00:00 2001 From: redth Date: Tue, 1 Mar 2022 17:08:16 -0500 Subject: [PATCH 6/6] Fix workload sdk band install location in tizen script --- azure-pipelines.yml | 2 ++ global.json | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8ce0e03..e92bf91 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -129,6 +129,8 @@ stages: - pwsh: | Invoke-WebRequest 'https://raw.githubusercontent.com/Samsung/Tizen.NET/main/workload/scripts/workload-install.ps1' -OutFile 'workload-install.ps1' + # Fix sdk band version in Tizen script + ((Get-Content -path .\workload-install.ps1 -Raw) -replace 'DotnetVersionBand = "6.0.200"','DotnetVersionBand = "6.0.300"') | Set-Content -Path .\workload-install.ps1 .\workload-install.ps1 displayName: install tizen diff --git a/global.json b/global.json index 47111a5..ca53f9b 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,4 @@ { - "sdk": { - "version": "6.0.200" - }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.23", "Microsoft.Build.NoTargets": "2.0.1"