From 8bcc6286a819ea2b533a8e9646eecf8e3b35af5b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 11 Aug 2023 14:07:39 -0700 Subject: [PATCH 01/46] Add error when targeting net8.0 in 17.7 and remove net8.0 from the supported dropdown list. --- src/Tasks/Common/Resources/Strings.resx | 14 +++++--------- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.de.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.fr.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.ko.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 11 +++-------- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 11 +++-------- .../GivenThatWeHaveErrorCodes.cs | 4 +++- .../targets/Microsoft.NET.Sdk.DefaultItems.targets | 12 +++--------- .../Microsoft.NET.SupportedTargetFrameworks.props | 6 +++--- 17 files changed, 53 insertions(+), 126 deletions(-) diff --git a/src/Tasks/Common/Resources/Strings.resx b/src/Tasks/Common/Resources/Strings.resx index 15d261f30be6..b38de04283cf 100644 --- a/src/Tasks/Common/Resources/Strings.resx +++ b/src/Tasks/Common/Resources/Strings.resx @@ -832,10 +832,6 @@ You may need to build the project on another operating system or architecture, o NETSDK1181: Error getting pack version: Pack '{0}' was not present in workload manifests. {StrBegin="NETSDK1181: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - {StrBegin="NETSDK1182: "} - NETSDK1184: The Targeting Pack for FrameworkReference '{0}' was not available. This may be because DisableTransitiveFrameworkReferenceDownloads was set to true. {StrBegin="NETSDK1184: "} @@ -864,10 +860,6 @@ You may need to build the project on another operating system or architecture, o NETSDK1191: A runtime identifier for the property '{0}' couldn't be inferred. Specify a rid explicitly. {StrBegin="NETSDK1191: "} - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - {StrBegin="NETSDK1192: "} - NETSDK1193: If PublishSelfContained is set, it must be either true or false. The value given was '{0}'. {StrBegin="NETSDK1193: "} @@ -952,5 +944,9 @@ You may need to build the project on another operating system or architecture, o <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} - + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + {StrBegin="NETSDK1192: "} + + diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index 0fc84a02108e..cfd0ef9a678d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Aktuální sada .NET SDK nepodporuje .NET Framework bez použití výchozích nastavení .NET SDK. Pravděpodobně došlo k neshodě mezi vlastnostmi CLRSupport projektu C++/CLI a TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Cílení na .NET 6.0 nebo vyšší ve Visual Studio 2019 se nepodporuje. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Cílení na .NET 7.0 nebo vyšší se ve Visual Studiu 2022 17.3 nepodporuje. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.de.xlf b/src/Tasks/Common/Resources/xlf/Strings.de.xlf index 559bcbe2bfb7..cb9076ee72d0 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.de.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.de.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Das aktuelle .NET SDK unterstützt das .NET Framework nur, wenn .NET SDK-Standardwerte verwendet werden. Wahrscheinlich liegt ein Konflikt zwischen der CLRSupport-Eigenschaft des C++-/CLI-Projekts und TargetFramework vor. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: .NET 6.0 oder höher wird als Ziel in Visual Studio 2019 nicht unterstützt. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Die Ausrichtung auf .NET 7.0 oder höher in Visual Studio 2022 17.3 wird nicht unterstützt. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index ca37cf63a34c..dcf115172ab3 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: El SDK de .NET actual no admite .NET Framework sin usar los valores predeterminados de dicho SDK. Posiblemente se deba a la falta de coincidencia entre la propiedad CLRSupport del proyecto de C++/CLI y TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: No se admite el destino de .NET 6.0 o superior en Visual Studio 2019. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: No se admite el destino de .NET 7.0 o superior en Visual Studio 2022 17.3. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf index ac3af1e3ab8c..813a308e85b3 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.fr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.fr.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Le SDK .NET actuel ne prend pas en charge le .NET Framework avec des valeurs du SDK .NET autres que celles par défaut. Cela est probablement dû à une incompatibilité entre la propriété CLRSupport du projet C++/CLI et TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: le ciblage de .NET 6.0 ou plus dans Visual Studio 2019 n’est pas pris en charge. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: le ciblage de .NET 7.0 ou plus dans Visual Studio 2022 17.3 n’est pas pris en charge. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index ad9362964337..4de243f038a6 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: The current .NET SDK does not support .NET Framework without using .NET SDK Defaults. It is likely due to a mismatch between C++/CLI project CLRSupport property and TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index e3e3fef57d01..f24528f2cc06 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: The current .NET SDK does not support .NET Framework without using .NET SDK Defaults. It is likely due to a mismatch between C++/CLI project CLRSupport property and TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf index 2b9e36350d1e..51d6d739a89d 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ko.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ko.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: 현재 .NET SDK는 .NET SDK 기본값을 사용하지 않는 .NET Framework를 지원하지 않습니다. C++/CLI 프로젝트 CLRSupport 속성과 TargetFramework 사이의 불일치 때문일 수 있습니다. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Visual Studio 2019에서 .NET 6.0 이상을 대상으로 하는 것은 지원되지 않습니다. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Visual Studio 2022 17.3에서 .NET 7.0 이상을 대상으로 하는 것은 지원되지 않습니다. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index 7e29d46898aa..619195e262c2 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Bieżący zestaw .NET SDK nie obsługuje programu .NET Framework bez użycia wartości domyślnych zestawu .NET SDK. Prawdopodobna przyczyna to niezgodność między właściwością CLRSupport projektu C++/CLI i elementu TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Platforma docelowa .NET 6.0 lub nowsza w usłudze Visual Studio 2019 nie jest obsługiwana. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Platforma docelowa .NET 7.0 lub nowsza w programie Visual Studio 2022 17.3 nie jest obsługiwana. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index a68563c0d138..0653924fbe88 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: o SDK do .NET atual não dá suporte ao .NET Framework sem o uso de Padrões do SDK do .NET. O motivo é provavelmente uma incompatibilidade entre a propriedade CLRSupport do projeto C++/CLI e a TargetFramework. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: o direcionamento do .NET 6.0 ou superior no Visual Studio 2019 não é compatível. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: O direcionamento do .NET 7.0 ou superior no Visual Studio 2022 17.3 não é compatível. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index 8830bc49fb26..40e9b85bc034 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: текущий пакет SDK для .NET не поддерживает .NET Framework без использования значений SDK для .NET по умолчанию. Причиной, скорее всего, является несоответствие TargetFramework и свойства CLRSupport в проекте C++/CLI. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: выбор .NET 6.0 или более поздней версии в качестве цели в Visual Studio 2019 не поддерживается. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: выбор .NET 7.0 или более поздней версии в качестве цели в Visual Studio 2022 17.3 не поддерживается. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index 32a6bf85959e..9b00846d908b 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: Geçerli .NET SDK, .NET SDK Varsayılanlarını kullanmadan .NET Framework'ü desteklemiyor. C++/CLI projesi CLRSupport özelliği ve TargetFramework arasındaki uyuşmazlık bu duruma neden olabilir. {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: Visual Studio 2019'da .NET 6.0 veya daha üst sürümünü hedefleme desteklenmiyor. - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: Visual Studio 2022 17.3'da .NET 7.0 veya daha üst sürümünü hedefleme desteklenmiyor. + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index f52ff0d3a330..43c1b89b249b 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: 未使用 .NET SDK 默认设置的情况下，当前 .NET SDK 不支持 .NET Framework。很可能是因为 C++/CLI 项目的 CLRSupport 属性和 TargetFramework 之间存在不匹配情况。 {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: 不支持在 Visual Studio 2019 中以 .NET 6.0 或更高版本为目标。 - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: 不支持在 Visual Studio 2022 17.3 中以 .NET 7.0 或更高版本为目标。 + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index f34140129cfc..8bbfd8e56eba 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -631,14 +631,9 @@ The following are names of parameters or literal values and should not be transl NETSDK1115: 目前的 .NET SDK 不支援在不使用 .NET SDK 預設的情形下使用 .NET Framework。這可能是因為 C++/CLI 專案 CLRSupport 屬性與 TargetFramework 不相符所致。 {StrBegin="NETSDK1115: "} - - NETSDK1182: Targeting .NET 6.0 or higher in Visual Studio 2019 is not supported. - NETSDK1182: 不支援在 Visual Studio 2019 中以 .NET 6.0 或更高版本為目標。 - {StrBegin="NETSDK1182: "} - - - NETSDK1192: Targeting .NET 7.0 or higher in Visual Studio 2022 17.3 is not supported. - NETSDK1192: 不支援在 Visual Studio 2022 17.3 中以 .NET 7.0 或更高版本為目標。 + + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. + NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported. {StrBegin="NETSDK1192: "} diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs index 4f7b106e187a..56e1c27f01de 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenThatWeHaveErrorCodes.cs @@ -31,8 +31,10 @@ public class GivenThatWeHaveErrorCodes 1101, 1108, 1180, + 1182, 1183, - 1190 + 1190, + 1192 }; //ILLink lives in other repos and violated the _info requirement for no error code diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets index 165ed94e0f5c..57394718a4c3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.DefaultItems.targets @@ -128,16 +128,10 @@ Copyright (c) .NET Foundation. All rights reserved. FormatArguments="$(SdkResolverGlobalJsonPath)" /> - - - - - - + Condition="$([MSBuild]::VersionLessThan($(MSBuildVersion), '17.8.0')) and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '8.0'))"> + - - + + From 953bfc876afac3284b2fe145cb33ba75719fcd27 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 16 Aug 2023 13:02:24 -0700 Subject: [PATCH 02/46] Add back the current version of MSBuild that got removed by accident in the CPM PR --- eng/Versions.props | 1 + src/Layout/tool_msbuild/tool_msbuild.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ab0d735796b5..4662267aa60a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,6 +104,7 @@ 17.8.0-preview-23414-01 + $(MicrosoftBuildPackageVersion) - 8.0.0-rc.2.23424.11 - 8.0.0-rc.2.23424.11 - 8.0.0-rc.2.23424.11 - 8.0.0-rc.2.23424.11 - 8.0.0-rc.2.23424.11 - 8.0.0-rc.2.23424.11 - 8.0.0-rc.2.23424.11 + 8.0.0-rc.2.23424.13 + 8.0.0-rc.2.23424.13 + 8.0.0-rc.2.23424.13 + 8.0.0-rc.2.23424.13 + 8.0.0-rc.2.23424.13 + 8.0.0-rc.2.23424.13 + 8.0.0-rc.2.23424.13 From 1ba009c7daae8a32b78a6725692151ffdbc47e0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Aug 2023 08:51:35 +0000 Subject: [PATCH 04/46] Update dependencies from https://github.com/dotnet/msbuild build 20230825.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23425-02 -> To Version 17.8.0-preview-23425-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a97e5913e3aa..731369405382 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,18 +48,18 @@ 66dbaefff04250dc72849f0172e0c53bcfb3ab38 - + https://github.com/dotnet/msbuild - 3cb18c917252e18d8d310a86e6333ded0077fcb1 + be26b4c6697f551c822129cc1534297e921ca298 - + https://github.com/dotnet/msbuild - 3cb18c917252e18d8d310a86e6333ded0077fcb1 + be26b4c6697f551c822129cc1534297e921ca298 - + https://github.com/dotnet/msbuild - 3cb18c917252e18d8d310a86e6333ded0077fcb1 + be26b4c6697f551c822129cc1534297e921ca298 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 37279d564243..0f98beacfb34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,7 +103,7 @@ - 17.8.0-preview-23425-02 + 17.8.0-preview-23425-03 diff --git a/eng/Versions.props b/eng/Versions.props index e135a7b87119..d6fd0e8c4f79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,12 +175,12 @@ - 8.0.0-beta.23422.2 - 8.0.0-beta.23422.2 - 8.0.0-beta.23422.2 - 8.0.0-beta.23422.2 - 8.0.0-beta.23422.2 - 8.0.0-beta.23422.2 + 8.0.0-beta.23425.1 + 8.0.0-beta.23425.1 + 8.0.0-beta.23425.1 + 8.0.0-beta.23425.1 + 8.0.0-beta.23425.1 + 8.0.0-beta.23425.1 From 0d544d37a1f7a3587e9ae60de6b84b44a2474158 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 25 Aug 2023 10:27:36 -0700 Subject: [PATCH 06/46] Get the current msbuild working with transitive pinning --- src/Layout/redist/redist.csproj | 5 +++++ src/Layout/tool_msbuild/tool_msbuild.csproj | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index 617c916816dc..bfa4fdf922a1 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -43,6 +43,11 @@ + + + + + diff --git a/src/Layout/tool_msbuild/tool_msbuild.csproj b/src/Layout/tool_msbuild/tool_msbuild.csproj index 8c7a7b5c9076..ce1500ce853a 100644 --- a/src/Layout/tool_msbuild/tool_msbuild.csproj +++ b/src/Layout/tool_msbuild/tool_msbuild.csproj @@ -8,6 +8,10 @@ + + + + From fcbf82920987219b1e32edc53c2fe683f6c207ff Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 25 Aug 2023 10:27:59 -0700 Subject: [PATCH 07/46] Skip all the tests failing on the full framework leg that are targeting 8.0 and so require 17.8 --- .../GivenThatWeManifestSupportedFrameworks.cs | 2 +- .../GivenThatWeWantToFloatWarningLevels.cs | 2 +- src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs | 4 ++-- .../GivenThatWeWantToCleanAProject.cs | 2 +- .../GivenThatWeWantToPublishAnAotApp.cs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs index 63fde6110857..558d0e449637 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeManifestSupportedFrameworks.cs @@ -9,7 +9,7 @@ public GivenThatWeManifestSupportedFrameworks(ITestOutputHelper log) : base(log) { } - [RequiresMSBuildVersionTheory("17.0")] + [RequiresMSBuildVersionTheory("17.8.0")] [InlineData(".NETCoreApp")] [InlineData(".NETStandard")] public void TheMaximumVersionsAreSupported(string targetFrameworkIdentifier) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs index f6062e312649..5a098b0f970f 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToFloatWarningLevels.cs @@ -371,7 +371,7 @@ static void Main() [InlineData("recommended", "true", new string[] { "CA1310", "CA1068", "CA2200" })] [InlineData("all", "false", new string[] { "CA1031", "CA1310", "CA1068", "CA2200" })] [InlineData("all", "true", new string[] { "CA1031", "CA1310", "CA1068", "CA2200" })] - [RequiresMSBuildVersionTheory("16.8")] + [RequiresMSBuildVersionTheory("17.8.0")] public void It_bulk_configures_rules_with_different_analysis_modes(string analysisMode, string codeAnalysisTreatWarningsAsErrors, string[] expectedViolations) { var testProject = new TestProject diff --git a/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs b/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs index c00c2a0edeed..ea806f4f4eb4 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/SourceLinkTests.cs @@ -112,7 +112,7 @@ public void WithNoGitMetadata() /// /// When creating a new repository locally we want the build to work and not report warnings even before the remote is set. /// - [Fact] + [RequiresMSBuildVersionFact("17.8.0")] public void WithNoRemoteNoCommit() { var testAsset = _testAssetsManager @@ -131,7 +131,7 @@ public void WithNoRemoteNoCommit() /// /// When creating a new repository locally we want the build to work and not report warnings even before the remote is set. /// - [Fact] + [RequiresMSBuildVersionFact("17.8.0")] public void WithNoRemote() { var testAsset = _testAssetsManager diff --git a/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs b/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs index 7f1076c12316..c00d909febcd 100644 --- a/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs +++ b/src/Tests/Microsoft.NET.Clean.Tests/GivenThatWeWantToCleanAProject.cs @@ -12,7 +12,7 @@ public GivenThatWeWantToCleanAHelloWorldProject(ITestOutputHelper log) : base(lo { } - [RequiresMSBuildVersionFact("17.0.0")] + [RequiresMSBuildVersionFact("17.8.0")] public void It_cleans_without_logging_assets_message() { var testAsset = _testAssetsManager diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index b5b61d69b995..e0a4f82c6007 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -18,7 +18,7 @@ public GivenThatWeWantToPublishAnAotApp(ITestOutputHelper log) : base(log) { } - [RequiresMSBuildVersionTheory("17.0.0.32901")] + [RequiresMSBuildVersionTheory("17.8.0")] [MemberData(nameof(Net7Plus), MemberType = typeof(PublishTestUtils))] public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string targetFramework) { @@ -72,7 +72,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string .And.HaveStdOutContaining("Hello World"); } - [RequiresMSBuildVersionTheory("17.0.0.32901")] + [RequiresMSBuildVersionTheory("17.8.0")] [MemberData(nameof(Net7Plus), MemberType = typeof(PublishTestUtils))] public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_false(string targetFramework) { From a0fcaed83fa5a06ca382cfa3f0b7e57e74a19333 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 23 Aug 2023 18:01:50 -0700 Subject: [PATCH 08/46] Enable Windows thread pool config switch via Project file --- src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj | 1 + .../targets/Microsoft.NET.Sdk.targets | 4 ++++ .../GivenThatWeWantToPublishAProjectWithAllFeatures.cs | 1 + 3 files changed, 6 insertions(+) diff --git a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj index 5d8801e682fd..fe0ad062f32b 100644 --- a/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj +++ b/src/Assets/TestProjects/KitchenSink/TestApp/TestApp.csproj @@ -41,6 +41,7 @@ false 2 9 + true diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets index 4002ebb89f0e..a90556b805cc 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets @@ -648,6 +648,10 @@ Copyright (c) .NET Foundation. All rights reserved. Condition="'$(ThreadPoolMaxThreads)' != ''" Value="$(ThreadPoolMaxThreads)" /> + + Date: Fri, 25 Aug 2023 19:27:17 +0000 Subject: [PATCH 09/46] Update dependencies from https://github.com/dotnet/aspnetcore build 20230825.6 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rc.2.23424.13 -> To Version 8.0.0-rc.2.23425.6 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3380e7565c31..2a538cc4c6aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,13 +104,13 @@ https://github.com/dotnet/roslyn d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 https://github.com/nuget/nuget.client @@ -229,50 +229,50 @@ https://github.com/dotnet/wpf 0399be4b0a7131584417910bb708d45373e10630 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 https://github.com/dotnet/razor @@ -287,21 +287,21 @@ https://github.com/dotnet/razor e5829d96c376650e66e91e7e47d1f6be19453c2d - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 - + https://github.com/dotnet/aspnetcore - 9781991a2402d10e6a94f804907bafecf7852b67 + 9a79397a6b436016958d16119929a9f6a8bfed15 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index e135a7b87119..c3a019e892a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,13 +146,13 @@ - 8.0.0-rc.2.23424.13 - 8.0.0-rc.2.23424.13 - 8.0.0-rc.2.23424.13 - 8.0.0-rc.2.23424.13 - 8.0.0-rc.2.23424.13 - 8.0.0-rc.2.23424.13 - 8.0.0-rc.2.23424.13 + 8.0.0-rc.2.23425.6 + 8.0.0-rc.2.23425.6 + 8.0.0-rc.2.23425.6 + 8.0.0-rc.2.23425.6 + 8.0.0-rc.2.23425.6 + 8.0.0-rc.2.23425.6 + 8.0.0-rc.2.23425.6 From b5f70b062101c48a711c8353db9d995712a51d9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 19:32:19 +0000 Subject: [PATCH 10/46] [release/8.0.1xx] Update dependencies from dotnet/fsharp (#34933) [release/8.0.1xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3380e7565c31..2adeed4047b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,13 +61,13 @@ https://github.com/dotnet/msbuild be26b4c6697f551c822129cc1534297e921ca298 - + https://github.com/dotnet/fsharp - 3068ea5fc0ad65cb07f2b32bbd522c654befebb5 + 0d3549fa5b8b6387ade191d76768405cefed8229 - + https://github.com/dotnet/fsharp - 3068ea5fc0ad65cb07f2b32bbd522c654befebb5 + 0d3549fa5b8b6387ade191d76768405cefed8229 diff --git a/eng/Versions.props b/eng/Versions.props index e135a7b87119..48d5f4a88fb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,7 +131,7 @@ - 12.8.0-beta.23424.5 + 12.8.0-beta.23425.10 From b102b170fd88883b1fe33bbda38d9b6ce4c97534 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 19:34:17 +0000 Subject: [PATCH 11/46] [release/8.0.1xx] Update dependencies from nuget/nuget.client (#34938) [release/8.0.1xx] Update dependencies from nuget/nuget.client --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2adeed4047b7..07367b531627 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -112,69 +112,69 @@ https://github.com/dotnet/aspnetcore 9781991a2402d10e6a94f804907bafecf7852b67 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/nuget/nuget.client - 4514d6022f0b46e4ae72d72eb5173e3b804cc014 + 0f33089a7bf04ff7a9ac94637d4a2462b942f777 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 48d5f4a88fb2..d315bf275eef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,18 +65,18 @@ - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 6.0.0-rc.278 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 - 6.8.0-preview.1.75 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 + 6.8.0-preview.1.80 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 86bd0d09ff26de34431ef08e6b39ae1c7b1ca741 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 19:34:42 +0000 Subject: [PATCH 12/46] [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#34932) [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07367b531627..228d26427cc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -335,9 +335,9 @@ e3cc6c792114ebdfe6627742d2820dbe1ae5bc47 - + https://github.com/dotnet/source-build-reference-packages - f4903e46459e0348e3793055dd8b68b8b0264034 + 93c23409e630c4f267234540b0e3557b76a53ef4 From e0631d56a65fb0e816e2959b65ade3833ceeb936 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 14:13:42 -0700 Subject: [PATCH 13/46] [release/8.0.1xx] [Blazor] Remove hot reload deltas cache (#34940) Co-authored-by: Mackinnon Buck --- .../BrowserRefresh/BlazorHotReload.js | 7 +------ .../BrowserRefresh/WebSocketScriptInjection.js | 17 ++++++++--------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js b/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js index c811f4461f02..089b3095ee2f 100644 --- a/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js +++ b/src/BuiltInTools/BrowserRefresh/BlazorHotReload.js @@ -3,12 +3,7 @@ export function receiveHotReload() { } export async function receiveHotReloadAsync() { - const cache = window.sessionStorage.getItem('blazor-webassembly-cache'); - let headers; - if (cache) { - headers = { 'if-none-match' : cache.etag }; - } - const response = await fetch('/_framework/blazor-hotreload', { headers }); + const response = await fetch('/_framework/blazor-hotreload'); if (response.status === 200) { const deltas = await response.json(); if (deltas) { diff --git a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js index 4b13c4a52b6a..7e9888999d76 100644 --- a/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js +++ b/src/BuiltInTools/BrowserRefresh/WebSocketScriptInjection.js @@ -124,7 +124,7 @@ setTimeout(async function () { styleElement.parentNode.insertBefore(newElement, styleElement.nextSibling); } - function applyBlazorDeltas(serverSecret, deltas, sendErrorToClient) { + async function applyBlazorDeltas(serverSecret, deltas, sendErrorToClient) { if (sharedSecret && (serverSecret != sharedSecret.encodedSharedSecret)) { // Validate the shared secret if it was specified. It might be unspecified in older versions of VS // that do not support this feature as yet. @@ -143,16 +143,15 @@ setTimeout(async function () { console.warn(error); applyError = error; } - }); + }); } - fetch('/_framework/blazor-hotreload', { method: 'post', headers: { 'content-type': 'application/json' }, body: JSON.stringify(deltas) }) - .then(response => { - if (response.status == 200) { - const etag = response.headers['etag']; - window.sessionStorage.setItem('blazor-webassembly-cache', { etag, deltas }); - } - }); + try { + await fetch('/_framework/blazor-hotreload', { method: 'post', headers: { 'content-type': 'application/json' }, body: JSON.stringify(deltas) }); + } catch (error) { + console.warn(error); + applyError = error; + } if (applyError) { sendDeltaNotApplied(sendErrorToClient ? applyError : undefined); From a336e28f688cbf55adb475316c0921ed21ce0e7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Aug 2023 21:59:14 +0000 Subject: [PATCH 14/46] Update dependencies from https://github.com/dotnet/aspnetcore build 20230825.8 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rc.2.23424.13 -> To Version 8.0.0-rc.2.23425.8 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a538cc4c6aa..3ef318e529ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,13 +104,13 @@ https://github.com/dotnet/roslyn d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 https://github.com/nuget/nuget.client @@ -229,50 +229,50 @@ https://github.com/dotnet/wpf 0399be4b0a7131584417910bb708d45373e10630 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 https://github.com/dotnet/razor @@ -287,21 +287,21 @@ https://github.com/dotnet/razor e5829d96c376650e66e91e7e47d1f6be19453c2d - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 - + https://github.com/dotnet/aspnetcore - 9a79397a6b436016958d16119929a9f6a8bfed15 + e0e74adca3eeec9ba88cd096567a4570d8f51030 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c3a019e892a6..d6a5146f3b15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,13 +146,13 @@ - 8.0.0-rc.2.23425.6 - 8.0.0-rc.2.23425.6 - 8.0.0-rc.2.23425.6 - 8.0.0-rc.2.23425.6 - 8.0.0-rc.2.23425.6 - 8.0.0-rc.2.23425.6 - 8.0.0-rc.2.23425.6 + 8.0.0-rc.2.23425.8 + 8.0.0-rc.2.23425.8 + 8.0.0-rc.2.23425.8 + 8.0.0-rc.2.23425.8 + 8.0.0-rc.2.23425.8 + 8.0.0-rc.2.23425.8 + 8.0.0-rc.2.23425.8 From b7cfc4d76ac163a319c59c3fa3c17831bfa0690e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Aug 2023 23:08:42 +0000 Subject: [PATCH 15/46] Update dependencies from https://github.com/dotnet/roslyn build 20230825.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-2.23424.9 -> To Version 4.8.0-2.23425.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228d26427cc9..97ba61a8f3d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,34 +75,34 @@ 1a9a3b61b7ed91ea17e69ceb1f954d431f0a1415 - + https://github.com/dotnet/roslyn - d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 + 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 - + https://github.com/dotnet/roslyn - d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 + 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 - + https://github.com/dotnet/roslyn - d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 + 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 - + https://github.com/dotnet/roslyn - d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 + 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 - + https://github.com/dotnet/roslyn - d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 + 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 - + https://github.com/dotnet/roslyn - d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 + 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 - + https://github.com/dotnet/roslyn - d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 + 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d1958d473a99..eef5983b62ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-2.23424.9 - 4.8.0-2.23424.9 - 4.8.0-2.23424.9 - 4.8.0-2.23424.9 - 4.8.0-2.23424.9 - 4.8.0-2.23424.9 - 4.8.0-2.23424.9 + 4.8.0-2.23425.1 + 4.8.0-2.23425.1 + 4.8.0-2.23425.1 + 4.8.0-2.23425.1 + 4.8.0-2.23425.1 + 4.8.0-2.23425.1 + 4.8.0-2.23425.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 8e3953c3fcb65121c9e7b1fba274e75f636d8361 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Aug 2023 23:37:24 +0000 Subject: [PATCH 16/46] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20230825.3 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23424.2 -> To Version 3.11.0-beta1.23425.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228d26427cc9..66b85a5821d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -308,17 +308,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - e1da9c89ca09a43ebac06a5e9ef0798407bc555b + 546d9ed731872c72279735c55f140ab8967f5656 - + https://github.com/dotnet/roslyn-analyzers - e1da9c89ca09a43ebac06a5e9ef0798407bc555b + 546d9ed731872c72279735c55f140ab8967f5656 - + https://github.com/dotnet/roslyn-analyzers - e1da9c89ca09a43ebac06a5e9ef0798407bc555b + 546d9ed731872c72279735c55f140ab8967f5656 diff --git a/eng/Versions.props b/eng/Versions.props index d1958d473a99..940db36cfc57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -98,8 +98,8 @@ - 8.0.0-preview.23424.2 - 3.11.0-beta1.23424.2 + 8.0.0-preview.23425.3 + 3.11.0-beta1.23425.3 From a9814499a3167f7d6362ec6e5fa11f7b4617b6b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Aug 2023 00:39:39 +0000 Subject: [PATCH 17/46] Update dependencies from https://github.com/dotnet/aspnetcore build 20230825.11 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rc.2.23424.13 -> To Version 8.0.0-rc.2.23425.11 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ef318e529ed..fbebb5014a48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,13 +104,13 @@ https://github.com/dotnet/roslyn d7e010bbe5b1d37837417fc5e79ecb2fd9b7b487 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 https://github.com/nuget/nuget.client @@ -229,50 +229,50 @@ https://github.com/dotnet/wpf 0399be4b0a7131584417910bb708d45373e10630 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 https://github.com/dotnet/razor @@ -287,21 +287,21 @@ https://github.com/dotnet/razor e5829d96c376650e66e91e7e47d1f6be19453c2d - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 - + https://github.com/dotnet/aspnetcore - e0e74adca3eeec9ba88cd096567a4570d8f51030 + fcc98f5c65ed50bfc024dbb0df1a2fa61a0790a3 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index d6a5146f3b15..f44655de111c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,13 +146,13 @@ - 8.0.0-rc.2.23425.8 - 8.0.0-rc.2.23425.8 - 8.0.0-rc.2.23425.8 - 8.0.0-rc.2.23425.8 - 8.0.0-rc.2.23425.8 - 8.0.0-rc.2.23425.8 - 8.0.0-rc.2.23425.8 + 8.0.0-rc.2.23425.11 + 8.0.0-rc.2.23425.11 + 8.0.0-rc.2.23425.11 + 8.0.0-rc.2.23425.11 + 8.0.0-rc.2.23425.11 + 8.0.0-rc.2.23425.11 + 8.0.0-rc.2.23425.11 From 857a5c8f81c7d663874b259c1eb1d7932b011b24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Aug 2023 01:08:31 +0000 Subject: [PATCH 18/46] Update dependencies from https://github.com/dotnet/sourcelink build 20230825.2 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23422.2 -> To Version 8.0.0-beta.23425.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a39add8d328..69384058beef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -344,28 +344,28 @@ https://github.com/dotnet/deployment-tools 850f61abed37b617a41fd59b63a37c284af6801d - + https://github.com/dotnet/sourcelink 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc - + https://github.com/dotnet/sourcelink 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc - + https://github.com/dotnet/sourcelink 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc - + https://github.com/dotnet/sourcelink 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc - + https://github.com/dotnet/sourcelink 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc - + https://github.com/dotnet/sourcelink 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc diff --git a/eng/Versions.props b/eng/Versions.props index d6fd0e8c4f79..c76221cdbd36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -175,12 +175,12 @@ - 8.0.0-beta.23425.1 - 8.0.0-beta.23425.1 - 8.0.0-beta.23425.1 - 8.0.0-beta.23425.1 - 8.0.0-beta.23425.1 - 8.0.0-beta.23425.1 + 8.0.0-beta.23425.2 + 8.0.0-beta.23425.2 + 8.0.0-beta.23425.2 + 8.0.0-beta.23425.2 + 8.0.0-beta.23425.2 + 8.0.0-beta.23425.2 From f746ed2d9170bef8491313c0bd1544b14b7d5b22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Aug 2023 01:36:08 +0000 Subject: [PATCH 19/46] Update dependencies from https://github.com/dotnet/roslyn build 20230825.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-2.23424.9 -> To Version 4.8.0-2.23425.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97ba61a8f3d2..6b7eeec66d57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,34 +75,34 @@ 1a9a3b61b7ed91ea17e69ceb1f954d431f0a1415 - + https://github.com/dotnet/roslyn - 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 + 12cccf48c8ca719bcd8865727594826a54a0a575 - + https://github.com/dotnet/roslyn - 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 + 12cccf48c8ca719bcd8865727594826a54a0a575 - + https://github.com/dotnet/roslyn - 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 + 12cccf48c8ca719bcd8865727594826a54a0a575 - + https://github.com/dotnet/roslyn - 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 + 12cccf48c8ca719bcd8865727594826a54a0a575 - + https://github.com/dotnet/roslyn - 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 + 12cccf48c8ca719bcd8865727594826a54a0a575 - + https://github.com/dotnet/roslyn - 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 + 12cccf48c8ca719bcd8865727594826a54a0a575 - + https://github.com/dotnet/roslyn - 60e8aa379b20a6f0c4e4ab052f7db18b24c82a42 + 12cccf48c8ca719bcd8865727594826a54a0a575 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index eef5983b62ec..b4471cc1b4b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-2.23425.1 - 4.8.0-2.23425.1 - 4.8.0-2.23425.1 - 4.8.0-2.23425.1 - 4.8.0-2.23425.1 - 4.8.0-2.23425.1 - 4.8.0-2.23425.1 + 4.8.0-2.23425.2 + 4.8.0-2.23425.2 + 4.8.0-2.23425.2 + 4.8.0-2.23425.2 + 4.8.0-2.23425.2 + 4.8.0-2.23425.2 + 4.8.0-2.23425.2 $(MicrosoftNetCompilersToolsetPackageVersion) From a6060e33608595b590df3218f53d298fb4b0db6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Aug 2023 03:37:35 +0000 Subject: [PATCH 20/46] Update dependencies from https://github.com/dotnet/roslyn build 20230825.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-2.23424.9 -> To Version 4.8.0-2.23425.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b7eeec66d57..ac2a658b411b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,34 +75,34 @@ 1a9a3b61b7ed91ea17e69ceb1f954d431f0a1415 - + https://github.com/dotnet/roslyn - 12cccf48c8ca719bcd8865727594826a54a0a575 + b0003b3c823d70e1509889ea3c9d0ac0d90f2645 - + https://github.com/dotnet/roslyn - 12cccf48c8ca719bcd8865727594826a54a0a575 + b0003b3c823d70e1509889ea3c9d0ac0d90f2645 - + https://github.com/dotnet/roslyn - 12cccf48c8ca719bcd8865727594826a54a0a575 + b0003b3c823d70e1509889ea3c9d0ac0d90f2645 - + https://github.com/dotnet/roslyn - 12cccf48c8ca719bcd8865727594826a54a0a575 + b0003b3c823d70e1509889ea3c9d0ac0d90f2645 - + https://github.com/dotnet/roslyn - 12cccf48c8ca719bcd8865727594826a54a0a575 + b0003b3c823d70e1509889ea3c9d0ac0d90f2645 - + https://github.com/dotnet/roslyn - 12cccf48c8ca719bcd8865727594826a54a0a575 + b0003b3c823d70e1509889ea3c9d0ac0d90f2645 - + https://github.com/dotnet/roslyn - 12cccf48c8ca719bcd8865727594826a54a0a575 + b0003b3c823d70e1509889ea3c9d0ac0d90f2645 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b4471cc1b4b8..0bba8d95ed47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-2.23425.2 - 4.8.0-2.23425.2 - 4.8.0-2.23425.2 - 4.8.0-2.23425.2 - 4.8.0-2.23425.2 - 4.8.0-2.23425.2 - 4.8.0-2.23425.2 + 4.8.0-2.23425.3 + 4.8.0-2.23425.3 + 4.8.0-2.23425.3 + 4.8.0-2.23425.3 + 4.8.0-2.23425.3 + 4.8.0-2.23425.3 + 4.8.0-2.23425.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 6a7c686704e850ce3d15132be6b2784d4d7e8287 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Aug 2023 12:43:05 +0000 Subject: [PATCH 21/46] Update dependencies from https://github.com/dotnet/arcade build 20230825.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23422.1 -> To Version 8.0.0-beta.23425.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23418.1 -> To Version 1.0.0-beta.23423.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228d26427cc9..30083bdd64c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -398,30 +398,30 @@ - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 - + https://github.com/dotnet/arcade - 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b + 90c167d5c57de4a8bced566379dbd893556c94e8 https://github.com/dotnet/runtime 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 - + https://github.com/dotnet/xliff-tasks - bb654cd4736e7e8cb99f1c355ce2b8f0a686ba74 + ed9a83526483c094fb51e7000b6f816ce6cb0325 diff --git a/eng/Versions.props b/eng/Versions.props index d1958d473a99..bb4df88a1c46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23422.1 + 8.0.0-beta.23425.2 7.0.0-preview.22423.2 8.0.0-rc.2.23423.11 4.3.0 @@ -172,7 +172,7 @@ - 1.0.0-beta.23418.1 + 1.0.0-beta.23423.1 @@ -191,7 +191,7 @@ 6.11.0 6.1.0 - 8.0.0-beta.23422.1 + 8.0.0-beta.23425.2 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index b1c58a0f1cf1..b988b18ff5f6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23422.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23422.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23425.2" } } From 5dc7e82907119982f499a5c6671c84ca5a1eb15c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Aug 2023 14:56:03 +0000 Subject: [PATCH 22/46] Update dependencies from https://github.com/nuget/nuget.client build 6.8.0.82 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.8.0-preview.1.80 -> To Version 6.8.0-preview.1.82 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228d26427cc9..8f87fb8547c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -112,69 +112,69 @@ https://github.com/dotnet/aspnetcore 9781991a2402d10e6a94f804907bafecf7852b67 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/nuget/nuget.client - 0f33089a7bf04ff7a9ac94637d4a2462b942f777 + 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index d1958d473a99..02afec33ad0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,18 +65,18 @@ - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 6.0.0-rc.278 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 - 6.8.0-preview.1.80 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 + 6.8.0-preview.1.82 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 9c4415265be927eb89bafc596964082fd8d7a6a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Aug 2023 16:27:58 +0000 Subject: [PATCH 23/46] Update dependencies from https://github.com/dotnet/roslyn build 20230826.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.8.0-2.23424.9 -> To Version 4.8.0-2.23426.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac2a658b411b..37bb97ec6cd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,34 +75,34 @@ 1a9a3b61b7ed91ea17e69ceb1f954d431f0a1415 - + https://github.com/dotnet/roslyn - b0003b3c823d70e1509889ea3c9d0ac0d90f2645 + 34268d1bb9370c7b01c742303a895a99daf10d6a - + https://github.com/dotnet/roslyn - b0003b3c823d70e1509889ea3c9d0ac0d90f2645 + 34268d1bb9370c7b01c742303a895a99daf10d6a - + https://github.com/dotnet/roslyn - b0003b3c823d70e1509889ea3c9d0ac0d90f2645 + 34268d1bb9370c7b01c742303a895a99daf10d6a - + https://github.com/dotnet/roslyn - b0003b3c823d70e1509889ea3c9d0ac0d90f2645 + 34268d1bb9370c7b01c742303a895a99daf10d6a - + https://github.com/dotnet/roslyn - b0003b3c823d70e1509889ea3c9d0ac0d90f2645 + 34268d1bb9370c7b01c742303a895a99daf10d6a - + https://github.com/dotnet/roslyn - b0003b3c823d70e1509889ea3c9d0ac0d90f2645 + 34268d1bb9370c7b01c742303a895a99daf10d6a - + https://github.com/dotnet/roslyn - b0003b3c823d70e1509889ea3c9d0ac0d90f2645 + 34268d1bb9370c7b01c742303a895a99daf10d6a https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0bba8d95ed47..985c1c69c3d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -136,13 +136,13 @@ - 4.8.0-2.23425.3 - 4.8.0-2.23425.3 - 4.8.0-2.23425.3 - 4.8.0-2.23425.3 - 4.8.0-2.23425.3 - 4.8.0-2.23425.3 - 4.8.0-2.23425.3 + 4.8.0-2.23426.1 + 4.8.0-2.23426.1 + 4.8.0-2.23426.1 + 4.8.0-2.23426.1 + 4.8.0-2.23426.1 + 4.8.0-2.23426.1 + 4.8.0-2.23426.1 $(MicrosoftNetCompilersToolsetPackageVersion) From b6c465a718fcabd9297b013b1e71a4bfd5dd2cce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 22:35:45 +0000 Subject: [PATCH 24/46] [release/8.0.1xx] Update dependencies from dotnet/runtime (#34922) [release/8.0.1xx] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 228d26427cc9..04ed1464c8e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ e4dd6740974287705a91918d808333e220e717d8 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest 55ce07a655084d06c1ccf069c2b246b91410bb67 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b - + https://github.com/dotnet/runtime - 3d1b2543593f0dc3fbbdc2b8cad9b1f8e7554af6 + 4122c63a13cfe40e97ac1f9ef01d8110a66943f4 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index d1958d473a99..d46752922001 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23422.1 7.0.0-preview.22423.2 - 8.0.0-rc.2.23423.11 + 8.0.0-rc.2.23426.4 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.2.23423.11 + 8.0.0-rc.2.23426.4 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23407.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 - 8.0.0-rc.2.23423.11 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 + 8.0.0-rc.2.23426.4 From 2c4a5bcf01a7f4f1591ea8510548fcd71c92d1a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 02:28:32 +0000 Subject: [PATCH 25/46] [release/8.0.1xx] Update dependencies from microsoft/vstest (#34960) [release/8.0.1xx] Update dependencies from microsoft/vstest --- 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 04ed1464c8e9..e5f3a0937567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,18 +176,18 @@ https://github.com/nuget/nuget.client 0f33089a7bf04ff7a9ac94637d4a2462b942f777 - + https://github.com/microsoft/vstest - 55ce07a655084d06c1ccf069c2b246b91410bb67 + 9c3a6326139638abb414448aa37780e196d29342 - + https://github.com/microsoft/vstest - 55ce07a655084d06c1ccf069c2b246b91410bb67 + 9c3a6326139638abb414448aa37780e196d29342 - + https://github.com/microsoft/vstest - 55ce07a655084d06c1ccf069c2b246b91410bb67 + 9c3a6326139638abb414448aa37780e196d29342 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d46752922001..91f607212a6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,9 +82,9 @@ - 17.8.0-preview-23424-02 - 17.8.0-preview-23424-02 - 17.8.0-preview-23424-02 + 17.8.0-preview-23425-02 + 17.8.0-preview-23425-02 + 17.8.0-preview-23425-02 From 786456b9df33edaeb2e43fb5862b3de9ef011a7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Aug 2023 07:26:14 +0000 Subject: [PATCH 26/46] Update dependencies from https://github.com/dotnet/msbuild build 20230828.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23425-03 -> To Version 17.8.0-preview-23428-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8589474de66f..8a8cd6e57f42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,18 +48,18 @@ 66dbaefff04250dc72849f0172e0c53bcfb3ab38 - + https://github.com/dotnet/msbuild - be26b4c6697f551c822129cc1534297e921ca298 + d7e9c2fad7169d6ddfec1aa5b1858fa2d206a86e - + https://github.com/dotnet/msbuild - be26b4c6697f551c822129cc1534297e921ca298 + d7e9c2fad7169d6ddfec1aa5b1858fa2d206a86e - + https://github.com/dotnet/msbuild - be26b4c6697f551c822129cc1534297e921ca298 + d7e9c2fad7169d6ddfec1aa5b1858fa2d206a86e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f7522da5468a..cce07f329a86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,7 +103,7 @@ - 17.8.0-preview-23425-03 + 17.8.0-preview-23428-02 $(MicrosoftBuildPackageVersion) - 17.8.0-preview-23428-02 + 17.8.0-preview-23428-01 $(MicrosoftBuildPackageVersion) - 17.8.0-preview-23428-01 + 17.8.0-preview-23428-04 $(MicrosoftBuildPackageVersion) - 17.8.0-preview-23425-02 - 17.8.0-preview-23425-02 - 17.8.0-preview-23425-02 + 17.8.0-preview-23427-01 + 17.8.0-preview-23427-01 + 17.8.0-preview-23427-01 From 07827a84236e8c9c4fbb24e5d6ed845597885411 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Aug 2023 13:13:51 +0000 Subject: [PATCH 30/46] Update dependencies from https://github.com/dotnet/fsharp build 20230828.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.100-beta.23425.10 -> To Version 8.0.100-beta.23428.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b7b509b6431..0dff5dded750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,13 +61,13 @@ https://github.com/dotnet/msbuild 5d24a7bd9a7537f5388f4f56405394c004cf1ad0 - + https://github.com/dotnet/fsharp - 0d3549fa5b8b6387ade191d76768405cefed8229 + fae92ea0972bf76dd64b6508cb15e637bca76594 - + https://github.com/dotnet/fsharp - 0d3549fa5b8b6387ade191d76768405cefed8229 + fae92ea0972bf76dd64b6508cb15e637bca76594 diff --git a/eng/Versions.props b/eng/Versions.props index 77bb8b797a7e..4621aa6dacdf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,7 +132,7 @@ - 12.8.0-beta.23425.10 + 12.8.0-beta.23428.1 From 2af9fba217d95144b14d61e26c04cf0ea5ab6ae3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Aug 2023 13:25:11 +0000 Subject: [PATCH 31/46] Update dependencies from https://github.com/microsoft/vstest build 20230828.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.8.0-preview-23425-02 -> To Version 17.8.0-preview-23428-01 --- 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 64ed32dc4671..cb081ca766e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,18 +176,18 @@ https://github.com/nuget/nuget.client 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/microsoft/vstest - b5d85245dc427a4da74698ed59c4eff325180442 + b3a3e9eb093d37ee8f8f2d3f359031827dc5a026 - + https://github.com/microsoft/vstest - b5d85245dc427a4da74698ed59c4eff325180442 + b3a3e9eb093d37ee8f8f2d3f359031827dc5a026 - + https://github.com/microsoft/vstest - b5d85245dc427a4da74698ed59c4eff325180442 + b3a3e9eb093d37ee8f8f2d3f359031827dc5a026 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a46eaf4d130c..d543663427a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,9 +82,9 @@ - 17.8.0-preview-23427-01 - 17.8.0-preview-23427-01 - 17.8.0-preview-23427-01 + 17.8.0-preview-23428-01 + 17.8.0-preview-23428-01 + 17.8.0-preview-23428-01 From bee0a38d792b5163a15a79d981902cbe31a62d77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Aug 2023 14:07:18 +0000 Subject: [PATCH 32/46] Update dependencies from https://github.com/dotnet/sourcelink build 20230828.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.23428.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b7b509b6431..894000a2d49c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -344,30 +344,30 @@ https://github.com/dotnet/deployment-tools 850f61abed37b617a41fd59b63a37c284af6801d - + https://github.com/dotnet/sourcelink - 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc + 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink - 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc + 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink - 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc + 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink - 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc + 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink - 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc + 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink - 1d1739c52b2d5a238727bbce10b3d15c5bf5e3cc + 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 diff --git a/eng/Versions.props b/eng/Versions.props index 77bb8b797a7e..c842dba3b344 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,12 +176,12 @@ - 8.0.0-beta.23425.2 - 8.0.0-beta.23425.2 - 8.0.0-beta.23425.2 - 8.0.0-beta.23425.2 - 8.0.0-beta.23425.2 - 8.0.0-beta.23425.2 + 8.0.0-beta.23428.1 + 8.0.0-beta.23428.1 + 8.0.0-beta.23428.1 + 8.0.0-beta.23428.1 + 8.0.0-beta.23428.1 + 8.0.0-beta.23428.1 From 291bcc244c817c99b54399394643ced502737beb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Aug 2023 14:12:33 +0000 Subject: [PATCH 33/46] Update dependencies from https://github.com/dotnet/msbuild build 20230828.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-05 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b7b509b6431..241c9150fe98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,18 +48,18 @@ 66dbaefff04250dc72849f0172e0c53bcfb3ab38 - + https://github.com/dotnet/msbuild - 5d24a7bd9a7537f5388f4f56405394c004cf1ad0 + 1093dfd18d96a4a276ec36d07fb0e74acd9eadee - + https://github.com/dotnet/msbuild - 5d24a7bd9a7537f5388f4f56405394c004cf1ad0 + 1093dfd18d96a4a276ec36d07fb0e74acd9eadee - + https://github.com/dotnet/msbuild - 5d24a7bd9a7537f5388f4f56405394c004cf1ad0 + 1093dfd18d96a4a276ec36d07fb0e74acd9eadee https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 77bb8b797a7e..5fd786767101 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,7 +103,7 @@ - 17.8.0-preview-23428-04 + 17.8.0-preview-23428-05 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23428.1 + 12.8.0-beta.23428.6 From 15d15064baa7594634fc11af5a3721c878d681cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Aug 2023 17:05:41 +0000 Subject: [PATCH 37/46] Update dependencies from https://github.com/microsoft/vstest build 20230828.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.8.0-preview-23425-02 -> To Version 17.8.0-preview-23428-02 --- 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 cb081ca766e1..15e59c5b91ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -176,18 +176,18 @@ https://github.com/nuget/nuget.client 7bb6ca5f6930d23fd93820dfc9c6a4373c8fd691 - + https://github.com/microsoft/vstest - b3a3e9eb093d37ee8f8f2d3f359031827dc5a026 + a246af4aa8c20372c19db51016d392032893b556 - + https://github.com/microsoft/vstest - b3a3e9eb093d37ee8f8f2d3f359031827dc5a026 + a246af4aa8c20372c19db51016d392032893b556 - + https://github.com/microsoft/vstest - b3a3e9eb093d37ee8f8f2d3f359031827dc5a026 + a246af4aa8c20372c19db51016d392032893b556 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d543663427a5..91bcc4ba10f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,9 +82,9 @@ - 17.8.0-preview-23428-01 - 17.8.0-preview-23428-01 - 17.8.0-preview-23428-01 + 17.8.0-preview-23428-02 + 17.8.0-preview-23428-02 + 17.8.0-preview-23428-02 From e29f321841d0f1242f87293dbf469275aa98532f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Aug 2023 17:54:50 +0000 Subject: [PATCH 38/46] Update dependencies from https://github.com/dotnet/msbuild build 20230828.7 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-04 -> To Version 17.8.0-preview-23428-07 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 241c9150fe98..2ee48d17c17b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,18 +48,18 @@ 66dbaefff04250dc72849f0172e0c53bcfb3ab38 - + https://github.com/dotnet/msbuild - 1093dfd18d96a4a276ec36d07fb0e74acd9eadee + 79ed5838b9a6e92371d7d6a34593d5ee7afda81c - + https://github.com/dotnet/msbuild - 1093dfd18d96a4a276ec36d07fb0e74acd9eadee + 79ed5838b9a6e92371d7d6a34593d5ee7afda81c - + https://github.com/dotnet/msbuild - 1093dfd18d96a4a276ec36d07fb0e74acd9eadee + 79ed5838b9a6e92371d7d6a34593d5ee7afda81c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5fd786767101..7e1b32b56ddf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,7 +103,7 @@ - 17.8.0-preview-23428-05 + 17.8.0-preview-23428-07 $(MicrosoftBuildPackageVersion) - 17.8.0-preview-23428-07 + 17.8.0-preview-23428-08 $(MicrosoftBuildPackageVersion) - 17.8.0-preview-23428-08 + 17.8.0-preview-23428-09 $(MicrosoftBuildPackageVersion) - 8.0.0-rc.2.23425.11 - 8.0.0-rc.2.23425.11 - 8.0.0-rc.2.23425.11 - 8.0.0-rc.2.23425.11 - 8.0.0-rc.2.23425.11 - 8.0.0-rc.2.23425.11 - 8.0.0-rc.2.23425.11 + 8.0.0-rc.2.23428.8 + 8.0.0-rc.2.23428.8 + 8.0.0-rc.2.23428.8 + 8.0.0-rc.2.23428.8 + 8.0.0-rc.2.23428.8 + 8.0.0-rc.2.23428.8 + 8.0.0-rc.2.23428.8 From 6a027a71f2631137666ed1effd2a23f358975ab2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Aug 2023 01:13:32 +0000 Subject: [PATCH 42/46] Update dependencies from https://github.com/dotnet/sourcelink build 20230828.2 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.23428.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 894000a2d49c..fb2f3896043d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -344,28 +344,28 @@ https://github.com/dotnet/deployment-tools 850f61abed37b617a41fd59b63a37c284af6801d - + https://github.com/dotnet/sourcelink 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 - + https://github.com/dotnet/sourcelink 5da1d7745d7178ae9aba532dc325ebdfb0a890a7 diff --git a/eng/Versions.props b/eng/Versions.props index c842dba3b344..65ae1252aa71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,12 +176,12 @@ - 8.0.0-beta.23428.1 - 8.0.0-beta.23428.1 - 8.0.0-beta.23428.1 - 8.0.0-beta.23428.1 - 8.0.0-beta.23428.1 - 8.0.0-beta.23428.1 + 8.0.0-beta.23428.2 + 8.0.0-beta.23428.2 + 8.0.0-beta.23428.2 + 8.0.0-beta.23428.2 + 8.0.0-beta.23428.2 + 8.0.0-beta.23428.2 From aec85f81ad63519dc6157e87a114b1889ba2b64f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Aug 2023 01:13:56 +0000 Subject: [PATCH 43/46] Update dependencies from https://github.com/dotnet/aspnetcore build 20230828.11 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rc.2.23425.11 -> To Version 8.0.0-rc.2.23428.11 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae8561a6332c..defb8f41b1c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -104,13 +104,13 @@ https://github.com/dotnet/roslyn 34268d1bb9370c7b01c742303a895a99daf10d6a - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b https://github.com/nuget/nuget.client @@ -229,50 +229,50 @@ https://github.com/dotnet/wpf 0399be4b0a7131584417910bb708d45373e10630 - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b https://github.com/dotnet/razor @@ -287,21 +287,21 @@ https://github.com/dotnet/razor e5829d96c376650e66e91e7e47d1f6be19453c2d - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b - + https://github.com/dotnet/aspnetcore - 051c94a80f0830afa5325311502577faab051e2f + c4d49b4468b899e08e245f370c179feca30e5f3b https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 9998738c7814..4bd80d94a448 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,13 +147,13 @@ - 8.0.0-rc.2.23428.8 - 8.0.0-rc.2.23428.8 - 8.0.0-rc.2.23428.8 - 8.0.0-rc.2.23428.8 - 8.0.0-rc.2.23428.8 - 8.0.0-rc.2.23428.8 - 8.0.0-rc.2.23428.8 + 8.0.0-rc.2.23428.11 + 8.0.0-rc.2.23428.11 + 8.0.0-rc.2.23428.11 + 8.0.0-rc.2.23428.11 + 8.0.0-rc.2.23428.11 + 8.0.0-rc.2.23428.11 + 8.0.0-rc.2.23428.11 From 3a356349a770d8f14b7e16f6ffab9fa148fa459a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Aug 2023 02:39:12 +0000 Subject: [PATCH 44/46] Update dependencies from https://github.com/dotnet/msbuild build 20230829.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23428-09 -> To Version 17.8.0-preview-23429-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 405e2ab8b0cd..bcfc7597380d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -48,18 +48,18 @@ 66dbaefff04250dc72849f0172e0c53bcfb3ab38 - + https://github.com/dotnet/msbuild - 99059059cbef13af6c2cb47d3476afff28b354f5 + 4faa4b6ddef2775cb9a896650fee30ca1fa0557c - + https://github.com/dotnet/msbuild - 99059059cbef13af6c2cb47d3476afff28b354f5 + 4faa4b6ddef2775cb9a896650fee30ca1fa0557c - + https://github.com/dotnet/msbuild - 99059059cbef13af6c2cb47d3476afff28b354f5 + 4faa4b6ddef2775cb9a896650fee30ca1fa0557c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a67b1941bf8b..08e201876d7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,7 +103,7 @@ - 17.8.0-preview-23428-09 + 17.8.0-preview-23429-01 $(MicrosoftBuildPackageVersion) - 17.8.0-preview-23429-01 + 17.8.0-preview-23429-02 $(MicrosoftBuildPackageVersion) - 8.0.0-rc.2.23428.11 - 8.0.0-rc.2.23428.11 - 8.0.0-rc.2.23428.11 - 8.0.0-rc.2.23428.11 - 8.0.0-rc.2.23428.11 - 8.0.0-rc.2.23428.11 - 8.0.0-rc.2.23428.11 + 8.0.0-rc.2.23428.15 + 8.0.0-rc.2.23428.15 + 8.0.0-rc.2.23428.15 + 8.0.0-rc.2.23428.15 + 8.0.0-rc.2.23428.15 + 8.0.0-rc.2.23428.15 + 8.0.0-rc.2.23428.15