From d1ea6792b52fca6a68a7529b481d999dd4ed5dd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Oct 2022 12:33:12 +0000 Subject: [PATCH 01/16] Update dependencies from https://github.com/dotnet/installer build 20221027.5 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22527.5 --- 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 8d665905c60..4e502aa8fe7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 8c1708f37899815bc298ab30e5f2561ec47f1929 + 4e3f7ef1087e0e083c65960c58f3d13170a633e0 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 40388bf716d..65ceded6164 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-alpha.1.22526.2 + 8.0.100-alpha.1.22527.5 7.0.100-1.22525.3 8.0.0-alpha.1.22524.5 7.0.0-beta.22103.1 From 198af68ecb620cce17193039d9126848d9203af6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Oct 2022 12:36:26 +0000 Subject: [PATCH 02/16] Update dependencies from https://github.com/dotnet/installer build 20221028.3 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22528.3 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22527.6 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e502aa8fe7..81626e0069f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 4e3f7ef1087e0e083c65960c58f3d13170a633e0 + dda7d3726edbef12d2548345a24adb18069923e1 https://github.com/dotnet/linker 4db6ac94ffa8bf6dae8ad9c5c68f94b58de917fd - + https://github.com/dotnet/runtime - 5108757b997c59ab8ba1fc5309ab0d4e730e2b77 + feb4bee67a111d6e6091b8492cef57a35191b1d9 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 65ceded6164..1e820b119f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-alpha.1.22527.5 + 8.0.100-alpha.1.22528.3 7.0.100-1.22525.3 - 8.0.0-alpha.1.22524.5 + 8.0.0-alpha.1.22527.6 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-alpha.1.22510.1 From 3d2a3087fe0a75aeee5336bba1972b9bb04222c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Oct 2022 12:28:49 +0000 Subject: [PATCH 03/16] Update dependencies from https://github.com/dotnet/installer build 20221031.1 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22531.1 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22529.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81626e0069f..522e838fafc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - dda7d3726edbef12d2548345a24adb18069923e1 + 52b37f406bf9bea78a1b3f7a853e8322ffe318d9 https://github.com/dotnet/linker 4db6ac94ffa8bf6dae8ad9c5c68f94b58de917fd - + https://github.com/dotnet/runtime - feb4bee67a111d6e6091b8492cef57a35191b1d9 + 9ed32f4ab89b24b14ab83c5982cb728131a28f24 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 1e820b119f7..7fb4ce98a06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-alpha.1.22528.3 + 8.0.100-alpha.1.22531.1 7.0.100-1.22525.3 - 8.0.0-alpha.1.22527.6 + 8.0.0-alpha.1.22529.1 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-alpha.1.22510.1 From b40053504db6e8f099d702d76a6f3db190a78463 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Nov 2022 12:57:49 +0000 Subject: [PATCH 04/16] Update dependencies from https://github.com/dotnet/installer build 20221031.8 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22531.8 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22530.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 522e838fafc..be9f4c3e007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 52b37f406bf9bea78a1b3f7a853e8322ffe318d9 + e5dc05973e6e2af25b608f21137f8b9738d2db83 https://github.com/dotnet/linker 4db6ac94ffa8bf6dae8ad9c5c68f94b58de917fd - + https://github.com/dotnet/runtime - 9ed32f4ab89b24b14ab83c5982cb728131a28f24 + e6700ea21bbb17ca5058801259bc2d05957814d4 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 7fb4ce98a06..77fe7e09415 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-alpha.1.22531.1 + 8.0.100-alpha.1.22531.8 7.0.100-1.22525.3 - 8.0.0-alpha.1.22529.1 + 8.0.0-alpha.1.22530.1 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-alpha.1.22510.1 From 2f7e63c917fa6b35ad0705979462bc05efb1f0ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Nov 2022 03:20:22 +0000 Subject: [PATCH 05/16] Update dependencies from https://github.com/dotnet/installer build 20221101.5 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22551.5 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22531.10 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be9f4c3e007..106972f12b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - e5dc05973e6e2af25b608f21137f8b9738d2db83 + 3cadd3e089c21212996b63c41a939f24b6537aec https://github.com/dotnet/linker 4db6ac94ffa8bf6dae8ad9c5c68f94b58de917fd - + https://github.com/dotnet/runtime - e6700ea21bbb17ca5058801259bc2d05957814d4 + 7d5efbb9e10b6d8beb91c90cbdefd7360869cece https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 77fe7e09415..37e64755bed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-alpha.1.22531.8 + 8.0.100-alpha.1.22551.5 7.0.100-1.22525.3 - 8.0.0-alpha.1.22530.1 + 8.0.0-alpha.1.22531.10 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-alpha.1.22510.1 From 9456bd3d5a16e26bbb09767fbb85c1190e52c162 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Nov 2022 12:45:48 +0000 Subject: [PATCH 06/16] Update dependencies from https://github.com/dotnet/installer build 20221102.5 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22552.5 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 8.0.0-alpha.1.22524.5 -> To Version 8.0.0-alpha.1.22531.10 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 106972f12b8..b7f62ff3e55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 3cadd3e089c21212996b63c41a939f24b6537aec + 218a9f41907b114ad84c4c1161e9ed623579d726 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 37e64755bed..d83a2d23031 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-alpha.1.22551.5 + 8.0.100-alpha.1.22552.5 7.0.100-1.22525.3 8.0.0-alpha.1.22531.10 7.0.0-beta.22103.1 From ba77092386a217467fcf1f6ff115445f8dc5ec52 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Nov 2022 12:47:54 +0000 Subject: [PATCH 07/16] Update dependencies from https://github.com/dotnet/installer build 20221103.2 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22553.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22552.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7f62ff3e55..d6d64447ea2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 218a9f41907b114ad84c4c1161e9ed623579d726 + bb61288be91ad621a5c3787808f07005f8704da6 - + https://github.com/dotnet/linker - 4db6ac94ffa8bf6dae8ad9c5c68f94b58de917fd + 391ac60bbfb2c618b82f08af728d2d4d259d584e - + https://github.com/dotnet/runtime - 7d5efbb9e10b6d8beb91c90cbdefd7360869cece + bdd67af67dbf43c0f5e9151b98dc100b9555898a https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index d83a2d23031..41249299ef9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-alpha.1.22552.5 - 7.0.100-1.22525.3 - 8.0.0-alpha.1.22531.10 + 8.0.100-alpha.1.22553.2 + 7.0.100-1.22552.1 + 8.0.0-alpha.1.22551.9 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-alpha.1.22510.1 From 4d1d7852ccaca89b9b49512149e9d46081d9fec6 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 3 Nov 2022 13:15:16 +0000 Subject: [PATCH 08/16] [Tests] Replace azurestorage with a github repo. Our `https://xamjenkinsartifact.azureedge.net` site for some of the unit test data seems to have disappeared. So lets use a github repo to store this data instead. The unit tests can download the raw files directly from github. The repo will be public as well so there won't be any need for authorization. --- .../Tests/Xamarin.ProjectTools/Common/BuildItem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/BuildItem.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/BuildItem.cs index 5a21c3b5edf..e1d656d867e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/BuildItem.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/BuildItem.cs @@ -133,11 +133,11 @@ public string WebContent { } /// - /// NOTE: downloads a file from our https://xamjenkinsartifact.azureedge.net/ Azure Storage Account + /// NOTE: downloads a file from our https://github.com/dellis1972/xamarin-android-unittest-files repo /// public string WebContentFileNameFromAzure { get { throw new NotSupportedException (); } - set { WebContent = $"https://xamjenkinsartifact.azureedge.net/mono-jenkins/xamarin-android-test/{value}"; } + set { WebContent = $"https://github.com/dellis1972/xamarin-android-unittest-files/blob/main/{value}?raw=true"; } } public string MetadataValues { From 3d2f5fbc3cac12652b9e4ec9f423a755a3f3b24c Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 3 Nov 2022 16:06:12 +0000 Subject: [PATCH 09/16] Switch DeleteBinObjTest to use 7z --- .../Tasks/FilterAssembliesTests.cs | 11 ++-- .../Common/DownloadedCache.cs | 4 +- .../Utilities/SevenZipHelper.cs | 51 +++++++++++++++++++ .../Tests/DeleteBinObjTest.cs | 8 ++- 4 files changed, 63 insertions(+), 11 deletions(-) create mode 100644 src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/SevenZipHelper.cs diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs index aff526a8e55..cbba64eac73 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/FilterAssembliesTests.cs @@ -30,13 +30,13 @@ public void TearDown () Directory.Delete (tempDirectory, recursive: true); } - Task DownloadFromNuGet (string url) => - Task.Factory.StartNew (() => new DownloadedCache ().GetAsFile (url)); + Task DownloadFromNuGet (string url, string filename = "") => + Task.Factory.StartNew (() => new DownloadedCache ().GetAsFile (url, filename)); - async Task GetAssembliesFromNuGet (string url, string path) + async Task GetAssembliesFromNuGet (string url, string filename, string path) { var assemblies = new List (); - var nuget = await DownloadFromNuGet (url); + var nuget = await DownloadFromNuGet (url, filename); using (var zip = ZipArchive.Open (nuget, FileMode.Open)) { foreach (var entry in zip) { if (entry.FullName.StartsWith (path, StringComparison.OrdinalIgnoreCase) && @@ -67,6 +67,7 @@ public async Task CircleImageView () { var assemblies = await GetAssembliesFromNuGet ( "https://www.nuget.org/api/v2/package/Refractored.Controls.CircleImageView/1.0.1", + "Refractored.Controls.CircleImageView.1.0.1.nupkg", "lib/MonoAndroid10/"); var actual = Run (assemblies); var expected = new [] { "Refractored.Controls.CircleImageView.dll" }; @@ -78,6 +79,7 @@ public async Task XamarinForms () { var assemblies = await GetAssembliesFromNuGet ( "https://www.nuget.org/api/v2/package/Xamarin.Forms/3.6.0.220655", + "Xamarin.Forms.3.6.0.220655.nupkg", "lib/MonoAndroid90/"); var actual = Run (assemblies); var expected = new [] { @@ -93,6 +95,7 @@ public async Task GuavaListenableFuture () { var assemblies = await GetAssembliesFromNuGet ( "https://www.nuget.org/api/v2/package/Xamarin.Google.Guava.ListenableFuture/1.0.0", + "Xamarin.Google.Guava.ListenableFuture.1.0.0.nupkg", "lib/MonoAndroid50/"); var actual = Run (assemblies); var expected = new [] { "Xamarin.Google.Guava.ListenableFuture.dll" }; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DownloadedCache.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DownloadedCache.cs index 298a7a8210b..f984abb3bc4 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DownloadedCache.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DownloadedCache.cs @@ -24,11 +24,11 @@ public DownloadedCache (string cacheDirectory) public string CacheDirectory { get; private set; } - public string GetAsFile (string url) + public string GetAsFile (string url, string filename = "") { Directory.CreateDirectory (CacheDirectory); - var filename = Path.Combine (CacheDirectory, Path.GetFileName (new Uri (url).LocalPath)); + filename = Path.Combine (CacheDirectory, string.IsNullOrEmpty (filename) ? Path.GetFileName (new Uri (url).LocalPath) : filename); lock (locks.GetOrAdd (filename, _ => new object ())) { if (File.Exists (filename)) return filename; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/SevenZipHelper.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/SevenZipHelper.cs new file mode 100644 index 00000000000..b839970f00d --- /dev/null +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Utilities/SevenZipHelper.cs @@ -0,0 +1,51 @@ +using System; +using System.IO; +using System.Diagnostics; + +namespace Xamarin.ProjectTools { + public class SevenZipHelper : IDisposable { + public string ArchivePath { get; private set; } + + public SevenZipHelper (string archivePath) + { + ArchivePath = archivePath; + } + + public bool ExtractAll (string destinationDir) + { + using (var p = new Process ()) { + p.StartInfo.FileName = Path.Combine ("7z"); + p.StartInfo.Arguments = $"x {ArchivePath} -o{destinationDir}"; + p.StartInfo.CreateNoWindow = true; + p.StartInfo.UseShellExecute = false; + p.StartInfo.RedirectStandardOutput = true; + p.StartInfo.RedirectStandardError = true; + p.ErrorDataReceived += (sender, e) => { + if (e.Data != null) { + Console.WriteLine (e.Data); + } + }; + p.ErrorDataReceived += (sender, e) => { + if (e.Data != null) { + Console.WriteLine (e.Data); + } + }; + + p.Start (); + p.BeginOutputReadLine (); + p.BeginErrorReadLine (); + bool completed = p.WaitForExit ((int) new TimeSpan (0, 15, 0).TotalMilliseconds); + return completed && p.ExitCode == 0; + } + } + + public void Dispose () + { + } + + public static SevenZipHelper Open (string path, FileMode fileMode) + { + return new SevenZipHelper (path); + } + } +} diff --git a/tests/MSBuildDeviceIntegration/Tests/DeleteBinObjTest.cs b/tests/MSBuildDeviceIntegration/Tests/DeleteBinObjTest.cs index 783b4d58af0..aeee3a0150d 100644 --- a/tests/MSBuildDeviceIntegration/Tests/DeleteBinObjTest.cs +++ b/tests/MSBuildDeviceIntegration/Tests/DeleteBinObjTest.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using Xamarin.ProjectTools; -using Xamarin.Tools.Zip; namespace Xamarin.Android.Build.Tests { @@ -10,17 +9,16 @@ namespace Xamarin.Android.Build.Tests [Category ("DotNetIgnore"), Category ("Node-1")] // .csproj files are legacy projects that won't build under dotnet public class DeleteBinObjTest : DeviceTest { - const string BaseUrl = "https://xamjenkinsartifact.azureedge.net/mono-jenkins/xamarin-android-test/"; + const string BaseUrl = "https://github.com/dellis1972/xamarin-android-unittest-files/blob/main/"; readonly DownloadedCache Cache = new DownloadedCache (); string HostOS => IsWindows ? "Windows" : "Darwin"; - void RunTest (string name, string sln, string csproj, string version, string revision, string packageName, string javaPackageName, bool isRelease) { var configuration = isRelease ? "Release" : "Debug"; - var zipPath = Cache.GetAsFile ($"{BaseUrl}{name}-{version}-{HostOS}-{revision}.zip"); + var zipPath = Cache.GetAsFile ($"{BaseUrl}{name}-{version}-{HostOS}-{revision}.7z?raw=true"); using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) - using (var zip = ZipArchive.Open (zipPath, FileMode.Open)) { + using (var zip = SevenZipHelper.Open (zipPath, FileMode.Open)) { builder.AutomaticNuGetRestore = false; if (!builder.TargetFrameworkExists ("v9.0")) { From 30ff3e293524249919799a908570041545da959e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Nov 2022 12:21:19 +0000 Subject: [PATCH 10/16] Update dependencies from https://github.com/dotnet/installer build 20221104.2 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22554.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22552.1 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 d6d64447ea2..aeeac71b157 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - bb61288be91ad621a5c3787808f07005f8704da6 + 17e703b7bfa328b31e9a59367f5e163602fc8188 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 41249299ef9..51b71f05f13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-alpha.1.22553.2 + 8.0.100-alpha.1.22554.2 7.0.100-1.22552.1 8.0.0-alpha.1.22551.9 7.0.0-beta.22103.1 From 9084dbaafa2dc267f58c2b52e001af0b4478edaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Nov 2022 12:40:42 +0000 Subject: [PATCH 11/16] Update dependencies from https://github.com/dotnet/installer build 20221104.7 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22554.7 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22552.1 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 aeeac71b157..0396d95dce8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 17e703b7bfa328b31e9a59367f5e163602fc8188 + 38e9569f3ea71f51125f9351deb49b5a427129b5 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 51b71f05f13..1174f36f791 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-alpha.1.22554.2 + 8.0.100-alpha.1.22554.7 7.0.100-1.22552.1 8.0.0-alpha.1.22551.9 7.0.0-beta.22103.1 From ecd855c932efec1ffb5623282d460f4a2a72dce9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 13:27:48 +0000 Subject: [PATCH 12/16] Update dependencies from https://github.com/dotnet/installer build 20221106.1 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22556.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22552.1 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 0396d95dce8..5264553f67a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 38e9569f3ea71f51125f9351deb49b5a427129b5 + 539bdbdff21174128922ee85cea6dff4c40507ca https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 1174f36f791..e38ef6b4ce7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-alpha.1.22554.7 + 8.0.100-alpha.1.22556.1 7.0.100-1.22552.1 8.0.0-alpha.1.22551.9 7.0.0-beta.22103.1 From eb1069e133af207b9237354edd8c86fb34100e67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 13:36:23 +0000 Subject: [PATCH 13/16] Update dependencies from https://github.com/dotnet/installer build 20221107.9 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22557.9 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22557.2 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5264553f67a..e3e5df7cb4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/installer - 539bdbdff21174128922ee85cea6dff4c40507ca + b85df61206f93beb7b6746cc3f3307082af6f035 - + https://github.com/dotnet/linker - 391ac60bbfb2c618b82f08af728d2d4d259d584e + dc5e60f5f2becf0b462d37ad918443126e80b49b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e38ef6b4ce7..4f75a8f692a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,8 +1,8 @@ - 8.0.100-alpha.1.22556.1 - 7.0.100-1.22552.1 + 8.0.100-alpha.1.22557.9 + 7.0.100-1.22557.2 8.0.0-alpha.1.22551.9 7.0.0-beta.22103.1 7.0.0-beta.22103.1 From f92d40b325f8140640555b924319c1a7b8cfd6a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Nov 2022 13:30:14 +0000 Subject: [PATCH 14/16] Update dependencies from https://github.com/dotnet/installer build 20221108.23 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22558.23 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100 From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22557.2 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3e5df7cb4b..d78886a684b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - b85df61206f93beb7b6746cc3f3307082af6f035 + 7a951d29e185a833f73e48b91076d6639f1be5a6 https://github.com/dotnet/linker dc5e60f5f2becf0b462d37ad918443126e80b49b - + https://github.com/dotnet/runtime - bdd67af67dbf43c0f5e9151b98dc100b9555898a + af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/emsdk - aecb1c71c70f6db44035602a879c57fa495d37e8 + b6656f5b78cd25f984355f973e65da3d844ac6d1 diff --git a/eng/Versions.props b/eng/Versions.props index 4f75a8f692a..aba1ea1af16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 8.0.100-alpha.1.22557.9 + 8.0.100-alpha.1.22558.23 7.0.100-1.22557.2 - 8.0.0-alpha.1.22551.9 + 8.0.0-alpha.1.22557.12 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-alpha.1.22510.1 + 8.0.0-alpha.1.22554.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) 7.0.100-rc.1.22410.7 From eed9e686d9abdaab740fed1f88264ccfac47651c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Nov 2022 13:44:12 +0000 Subject: [PATCH 15/16] Update dependencies from https://github.com/dotnet/installer build 20221109.18 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22559.18 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100 From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22557.2 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 d78886a684b..75bc832b0fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 7a951d29e185a833f73e48b91076d6639f1be5a6 + 272c31430868cd6f9abfec3442159f52e8bf4ae0 https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index aba1ea1af16..5110186e04a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-alpha.1.22558.23 + 8.0.100-alpha.1.22559.18 7.0.100-1.22557.2 8.0.0-alpha.1.22557.12 7.0.0-beta.22103.1 From bd375864d5bd35bcf1daf02caa722d46d1843860 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 13:15:18 +0000 Subject: [PATCH 16/16] Update dependencies from https://github.com/dotnet/installer build 20221112.2 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-alpha.1.22526.2 -> To Version 8.0.100-alpha.1.22562.2 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100 From Version 7.0.100-1.22525.3 -> To Version 7.0.100-1.22560.1 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75bc832b0fb..75db990d63c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 272c31430868cd6f9abfec3442159f52e8bf4ae0 + 355d6643bdcd7e5a918550b67d12e35e65d8c646 - + https://github.com/dotnet/linker - dc5e60f5f2becf0b462d37ad918443126e80b49b + 9c993bf401377209cd7b4e84b60deab5e4f421a2 - + https://github.com/dotnet/runtime - af841c8b33cecc92d74222298f1e45bf7bf3d90a + dd7fdb723d91c2c6cb7efc3d95f9d95ee86d48c8 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 5110186e04a..7cfcbd46647 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ - 8.0.100-alpha.1.22559.18 - 7.0.100-1.22557.2 - 8.0.0-alpha.1.22557.12 + 8.0.100-alpha.1.22562.2 + 7.0.100-1.22560.1 + 8.0.0-alpha.1.22559.2 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-alpha.1.22554.1