From 236799b859a9534cd57f6b8fc208498617a00705 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Dec 2025 13:38:37 +0000 Subject: [PATCH 1/8] Backflow from https://github.com/dotnet/dotnet / 6ec92e4 build 295059 [[ commit created by automation ]] --- .devcontainer/devcontainer.json | 1 - Directory.Build.props | 7 +- Directory.Packages.props | 1 + build/RunTestsOnHelix.cmd | 1 - eng/SignCheckExclusionsFile.txt | 34 --- eng/Signing.props | 4 + eng/Versions.props | 48 ++-- eng/restore-toolset.ps1 | 2 - eng/restore-toolset.sh | 1 - .../HotReload/HotReloadEventSource.cs | 2 +- .../TabularOutput/TabularOutput.cs | 4 +- src/Cli/dotnet/PerformanceLogEventSource.cs | 6 +- src/Layout/Directory.Build.props | 6 + .../PackageOverrides.txt | 140 +++++++++ .../PackageOverrides.txt | 272 ++++++++++++++++++ .../PackageOverrides.txt | 16 ++ src/Layout/redist/roslyn-entitlements.plist | 16 ++ src/Layout/redist/targets/BundledSdks.targets | 1 - .../redist/targets/BundledTemplates.targets | 17 +- src/Layout/redist/targets/Crossgen.targets | 4 +- .../targets/GenerateBundledVersions.targets | 2 +- .../redist/targets/GenerateLayout.targets | 10 + .../targets/GeneratePackagePruneData.targets | 46 ++- .../redist/targets/OverlaySdkOnLKG.targets | 2 +- .../Microsoft.CodeAnalysis.NetAnalyzers.sarif | 6 +- .../CollatePackageDownloads.cs | 4 +- .../GetPackagesToPrune.cs | 13 +- .../Microsoft.NET.Build.Tasks.csproj | 8 +- .../Microsoft.NET.Build.Tasks/sdk/Sdk.targets | 3 +- .../sdk-tasks/EnvironmentVariableFilter.cs | 1 - .../TestContext.cs | 4 - 31 files changed, 563 insertions(+), 119 deletions(-) delete mode 100644 eng/SignCheckExclusionsFile.txt create mode 100644 src/Layout/redist/PrunePackageData/10.0/Microsoft.AspNetCore.App/PackageOverrides.txt create mode 100644 src/Layout/redist/PrunePackageData/10.0/Microsoft.NETCore.App/PackageOverrides.txt create mode 100644 src/Layout/redist/PrunePackageData/10.0/Microsoft.WindowsDesktop.App/PackageOverrides.txt create mode 100644 src/Layout/redist/roslyn-entitlements.plist diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6974b84d76f6..0b7cf4ba519a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -23,7 +23,6 @@ "remoteEnv": { "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}", "DOTNET_INSTALL_DIR": "${containerWorkspaceFolder}/.dotnet", - "DOTNET_MULTILEVEL_LOOKUP": "0", "DOTNET_ROOT": "${containerWorkspaceFolder}/.dotnet", "DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR": "${containerWorkspaceFolder}/.dotnet", "NUGET_PACKAGES": "/home/vscode/.nuget/packages" diff --git a/Directory.Build.props b/Directory.Build.props index b7c097f97cdc..efd09467f304 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -99,12 +99,7 @@ $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) diff --git a/Directory.Packages.props b/Directory.Packages.props index 788923bf48d6..ca461b8d0f07 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -101,6 +101,7 @@ + diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd index f55fcf1ead42..9357ed92100c 100644 --- a/build/RunTestsOnHelix.cmd +++ b/build/RunTestsOnHelix.cmd @@ -7,7 +7,6 @@ set NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000 set MicrosoftNETBuildExtensionsTargets=%HELIX_CORRELATION_PAYLOAD%\ex\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\Microsoft.NET.Build.Extensions.targets set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\d set PATH=%DOTNET_ROOT%;%PATH% -set DOTNET_MULTILEVEL_LOOKUP=0 set TestFullMSBuild=%1 REM Use powershell to call partical Arcade logic to get full framework msbuild path and assign it diff --git a/eng/SignCheckExclusionsFile.txt b/eng/SignCheckExclusionsFile.txt deleted file mode 100644 index 63ec531fd6bc..000000000000 --- a/eng/SignCheckExclusionsFile.txt +++ /dev/null @@ -1,34 +0,0 @@ -;; File passed to the SignCheck tool for exclusions - -;; Dlls from packages created for tests to consume -dotnet-dependency-context-test.dll -dotnet-desktop-binding-redirects.exe -dotnet-fallbackfoldertool.dll -dotnet-hello*.dll -dotnet-outputsframeworkversion-netcoreapp1.0*.dll -dotnet-portable-v1-prefercli*.dll -dotnet-portable-v1*.dll -dotnet-portable*.dll -dotnet-prefercliruntime*.dll -PackageWithFakeNativeDep*.dll -dotnet-tool-with-output-name*.dll - -;; Third party DLLs used by tests -Castle.Core*.dll -Moq*.dll - -;; Binary test asset -testwpf*.dll - -;; Possibly no longer needed -kerneltracecontrol*.dll -msdia140*.dll - -;; Javascript files aren't signed -*.js - -;; Installer exclusions -*apphost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*singlefilehost.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*comhost.dll;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 -*apphosttemplateapphostexe.exe;;Template, DO-NOT-SIGN, https://github.com/dotnet/core-setup/pull/7549 \ No newline at end of file diff --git a/eng/Signing.props b/eng/Signing.props index 484697efecbc..1466a1d5272b 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -64,6 +64,7 @@ + @@ -84,6 +85,9 @@ + + + diff --git a/eng/Versions.props b/eng/Versions.props index 968b8a18201c..bc6887c20614 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,36 +1,33 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + + + - 10 + 11 0 1 00 + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) + alpha + 1 + + + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)00 $(VersionMajor).$(VersionMinor).100 - $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - - false - release - - rc - rtm - servicing - 2 + true true - true + 30 32 @@ -47,11 +44,13 @@ $([MSBuild]::Add($(VersionFeature80), 1)) $([MSBuild]::Add($(VersionFeature90), 1)) + https://ci.dot.net/public/ https://dotnetclimsrc.blob.core.windows.net/dotnet/ + 1.0.0-20230414.1 2.23.0 @@ -69,13 +68,16 @@ 1.0.52 + 0.2.0 + 9.4.0 + @@ -92,6 +94,7 @@ 4.5.4 8.0.0 + - 17.14.8 + 17.14.28 18.0 + @@ -123,15 +127,13 @@ 3.1.12 2.0.23 + - 1.8.1 + 1.10.2 4.0.1 - - - true - + 8.0.2 @@ -141,6 +143,7 @@ 8.0.0-beta.23607.1 0.14.0 + 10.0.100-preview.6 10.0.0-preview.6.25359.8 @@ -150,9 +153,12 @@ 15.5.10415-net10-p6 18.5.10415-net10-p6 + 2.0.1-servicing-26011-01 + + diff --git a/eng/restore-toolset.ps1 b/eng/restore-toolset.ps1 index 5b3fb632f218..95d615051475 100644 --- a/eng/restore-toolset.ps1 +++ b/eng/restore-toolset.ps1 @@ -42,7 +42,6 @@ function CreateBuildEnvScripts() $scriptContents = @" @echo off title SDK Build ($RepoRoot) -set DOTNET_MULTILEVEL_LOOKUP=0 REM https://aka.ms/vs/unsigned-dotnet-debugger-lib set VSDebugger_ValidateDotnetDebugLibSignatures=0 @@ -62,7 +61,6 @@ DOSKEY killdotnet=taskkill /F /IM dotnet.exe /T ^& taskkill /F /IM VSTest.Consol $scriptPath = Join-Path $ArtifactsDir "sdk-build-env.ps1" $scriptContents = @" `$host.ui.RawUI.WindowTitle = "SDK Build ($RepoRoot)" -`$env:DOTNET_MULTILEVEL_LOOKUP=0 # https://aka.ms/vs/unsigned-dotnet-debugger-lib `$env:VSDebugger_ValidateDotnetDebugLibSignatures=0 diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh index f7ba940aa92f..33db546481ed 100755 --- a/eng/restore-toolset.sh +++ b/eng/restore-toolset.sh @@ -54,7 +54,6 @@ function CreateBuildEnvScript { scriptPath="$artifacts_dir/sdk-build-env.sh" scriptContents=" #!/usr/bin/env bash -export DOTNET_MULTILEVEL_LOOKUP=0 export DOTNET_ROOT=$DOTNET_INSTALL_DIR export DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$DOTNET_INSTALL_DIR diff --git a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs index 04b3dbb70d52..92af26786b5a 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadEventSource.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Watch { [EventSource(Name = "HotReload")] - internal sealed class HotReloadEventSource : EventSource + internal sealed partial class HotReloadEventSource : EventSource { public enum StartType { diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TabularOutput/TabularOutput.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TabularOutput/TabularOutput.cs index f70889a7043a..7ab182347730 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/TabularOutput/TabularOutput.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/TabularOutput/TabularOutput.cs @@ -128,11 +128,11 @@ internal string Layout(int indent = 0) { for (int i = 0; i < _columns.Count; ++i) { - b.Append(new string(_settings.HeaderSeparator.Value, _columns[i].CalculatedWidth)); + b.Append(_settings.HeaderSeparator.Value, _columns[i].CalculatedWidth); if (i < _columns.Count - 1) { - b.Append(new string(' ', _settings.ColumnPadding)); + b.Append(' ', _settings.ColumnPadding); } } b.AppendLine().Indent(indent); diff --git a/src/Cli/dotnet/PerformanceLogEventSource.cs b/src/Cli/dotnet/PerformanceLogEventSource.cs index 0879b02f1725..0d1912db6c72 100644 --- a/src/Cli/dotnet/PerformanceLogEventSource.cs +++ b/src/Cli/dotnet/PerformanceLogEventSource.cs @@ -12,14 +12,10 @@ namespace Microsoft.DotNet.Cli; [EventSource(Name = "Microsoft-Dotnet-CLI-Performance", Guid = "cbd57d06-3b9f-5374-ed53-cfbcc23cf44f")] -internal sealed class PerformanceLogEventSource : EventSource +internal sealed partial class PerformanceLogEventSource : EventSource { internal static PerformanceLogEventSource Log = new(); - private PerformanceLogEventSource() - { - } - [NonEvent] internal void LogStartUpInformation(PerformanceLogStartupInformation startupInfo) { diff --git a/src/Layout/Directory.Build.props b/src/Layout/Directory.Build.props index 479a7c0a421e..c8bc9ffafc2a 100644 --- a/src/Layout/Directory.Build.props +++ b/src/Layout/Directory.Build.props @@ -78,4 +78,10 @@ $(MSBuildThisFileDirectory)pkg\ + + <_RoslynAppHost Include="$(OutputPath)Roslyn\bincore\csc.dll" /> + <_RoslynAppHost Include="$(OutputPath)Roslyn\bincore\vbc.dll" /> + <_RoslynAppHost Include="$(OutputPath)Roslyn\bincore\VBCSCompiler.dll" /> + + diff --git a/src/Layout/redist/PrunePackageData/10.0/Microsoft.AspNetCore.App/PackageOverrides.txt b/src/Layout/redist/PrunePackageData/10.0/Microsoft.AspNetCore.App/PackageOverrides.txt new file mode 100644 index 000000000000..36fe1999d53c --- /dev/null +++ b/src/Layout/redist/PrunePackageData/10.0/Microsoft.AspNetCore.App/PackageOverrides.txt @@ -0,0 +1,140 @@ +Microsoft.Extensions.Caching.Abstractions|10.0.0 +Microsoft.Extensions.Caching.Memory|10.0.0 +Microsoft.Extensions.Configuration.Abstractions|10.0.0 +Microsoft.Extensions.Configuration.Binder|10.0.0 +Microsoft.Extensions.Configuration.CommandLine|10.0.0 +Microsoft.Extensions.Configuration|10.0.0 +Microsoft.Extensions.Configuration.EnvironmentVariables|10.0.0 +Microsoft.Extensions.Configuration.FileExtensions|10.0.0 +Microsoft.Extensions.Configuration.Ini|10.0.0 +Microsoft.Extensions.Configuration.Json|10.0.0 +Microsoft.Extensions.Configuration.UserSecrets|10.0.0 +Microsoft.Extensions.Configuration.Xml|10.0.0 +Microsoft.Extensions.DependencyInjection.Abstractions|10.0.0 +Microsoft.Extensions.DependencyInjection|10.0.0 +Microsoft.Extensions.Diagnostics.Abstractions|10.0.0 +Microsoft.Extensions.Diagnostics|10.0.0 +Microsoft.Extensions.FileProviders.Abstractions|10.0.0 +Microsoft.Extensions.FileProviders.Composite|10.0.0 +Microsoft.Extensions.FileProviders.Physical|10.0.0 +Microsoft.Extensions.FileSystemGlobbing|10.0.0 +Microsoft.Extensions.Hosting.Abstractions|10.0.0 +Microsoft.Extensions.Hosting|10.0.0 +Microsoft.Extensions.Http|10.0.0 +Microsoft.Extensions.Logging.Abstractions|10.0.0 +Microsoft.Extensions.Logging.Configuration|10.0.0 +Microsoft.Extensions.Logging.Console|10.0.0 +Microsoft.Extensions.Logging.Debug|10.0.0 +Microsoft.Extensions.Logging|10.0.0 +Microsoft.Extensions.Logging.EventLog|10.0.0 +Microsoft.Extensions.Logging.EventSource|10.0.0 +Microsoft.Extensions.Logging.TraceSource|10.0.0 +Microsoft.Extensions.Options.ConfigurationExtensions|10.0.0 +Microsoft.Extensions.Options.DataAnnotations|10.0.0 +Microsoft.Extensions.Options|10.0.0 +Microsoft.Extensions.Primitives|10.0.0 +System.Diagnostics.EventLog|10.0.0 +System.Formats.Cbor|10.0.0 +System.Security.Cryptography.Xml|10.0.0 +System.Threading.RateLimiting|10.0.0 +Microsoft.AspNetCore.Antiforgery|10.0.0 +Microsoft.AspNetCore.Authentication.Abstractions|10.0.0 +Microsoft.AspNetCore.Authentication.BearerToken|10.0.0 +Microsoft.AspNetCore.Authentication.Cookies|10.0.0 +Microsoft.AspNetCore.Authentication.Core|10.0.0 +Microsoft.AspNetCore.Authentication|10.0.0 +Microsoft.AspNetCore.Authentication.OAuth|10.0.0 +Microsoft.AspNetCore.Authorization|10.0.0 +Microsoft.AspNetCore.Authorization.Policy|10.0.0 +Microsoft.AspNetCore.Components.Authorization|10.0.0 +Microsoft.AspNetCore.Components|10.0.0 +Microsoft.AspNetCore.Components.Endpoints|10.0.0 +Microsoft.AspNetCore.Components.Forms|10.0.0 +Microsoft.AspNetCore.Components.Server|10.0.0 +Microsoft.AspNetCore.Components.Web|10.0.0 +Microsoft.AspNetCore.Connections.Abstractions|10.0.0 +Microsoft.AspNetCore.CookiePolicy|10.0.0 +Microsoft.AspNetCore.Cors|10.0.0 +Microsoft.AspNetCore.Cryptography.Internal|10.0.0 +Microsoft.AspNetCore.Cryptography.KeyDerivation|10.0.0 +Microsoft.AspNetCore.DataProtection.Abstractions|10.0.0 +Microsoft.AspNetCore.DataProtection|10.0.0 +Microsoft.AspNetCore.DataProtection.Extensions|10.0.0 +Microsoft.AspNetCore.Diagnostics.Abstractions|10.0.0 +Microsoft.AspNetCore.Diagnostics|10.0.0 +Microsoft.AspNetCore.Diagnostics.HealthChecks|10.0.0 +Microsoft.AspNetCore|10.0.0 +Microsoft.AspNetCore.HostFiltering|10.0.0 +Microsoft.AspNetCore.Hosting.Abstractions|10.0.0 +Microsoft.AspNetCore.Hosting|10.0.0 +Microsoft.AspNetCore.Hosting.Server.Abstractions|10.0.0 +Microsoft.AspNetCore.Html.Abstractions|10.0.0 +Microsoft.AspNetCore.Http.Abstractions|10.0.0 +Microsoft.AspNetCore.Http.Connections.Common|10.0.0 +Microsoft.AspNetCore.Http.Connections|10.0.0 +Microsoft.AspNetCore.Http|10.0.0 +Microsoft.AspNetCore.Http.Extensions|10.0.0 +Microsoft.AspNetCore.Http.Features|10.0.0 +Microsoft.AspNetCore.Http.Results|10.0.0 +Microsoft.AspNetCore.HttpLogging|10.0.0 +Microsoft.AspNetCore.HttpOverrides|10.0.0 +Microsoft.AspNetCore.HttpsPolicy|10.0.0 +Microsoft.AspNetCore.Identity|10.0.0 +Microsoft.AspNetCore.Localization|10.0.0 +Microsoft.AspNetCore.Localization.Routing|10.0.0 +Microsoft.AspNetCore.Metadata|10.0.0 +Microsoft.AspNetCore.Mvc.Abstractions|10.0.0 +Microsoft.AspNetCore.Mvc.ApiExplorer|10.0.0 +Microsoft.AspNetCore.Mvc.Core|10.0.0 +Microsoft.AspNetCore.Mvc.Cors|10.0.0 +Microsoft.AspNetCore.Mvc.DataAnnotations|10.0.0 +Microsoft.AspNetCore.Mvc|10.0.0 +Microsoft.AspNetCore.Mvc.Formatters.Json|10.0.0 +Microsoft.AspNetCore.Mvc.Formatters.Xml|10.0.0 +Microsoft.AspNetCore.Mvc.Localization|10.0.0 +Microsoft.AspNetCore.Mvc.Razor|10.0.0 +Microsoft.AspNetCore.Mvc.RazorPages|10.0.0 +Microsoft.AspNetCore.Mvc.TagHelpers|10.0.0 +Microsoft.AspNetCore.Mvc.ViewFeatures|10.0.0 +Microsoft.AspNetCore.OutputCaching|10.0.0 +Microsoft.AspNetCore.RateLimiting|10.0.0 +Microsoft.AspNetCore.Razor|10.0.0 +Microsoft.AspNetCore.Razor.Runtime|10.0.0 +Microsoft.AspNetCore.RequestDecompression|10.0.0 +Microsoft.AspNetCore.ResponseCaching.Abstractions|10.0.0 +Microsoft.AspNetCore.ResponseCaching|10.0.0 +Microsoft.AspNetCore.ResponseCompression|10.0.0 +Microsoft.AspNetCore.Rewrite|10.0.0 +Microsoft.AspNetCore.Routing.Abstractions|10.0.0 +Microsoft.AspNetCore.Routing|10.0.0 +Microsoft.AspNetCore.Server.HttpSys|10.0.0 +Microsoft.AspNetCore.Server.IIS|10.0.0 +Microsoft.AspNetCore.Server.IISIntegration|10.0.0 +Microsoft.AspNetCore.Server.Kestrel.Core|10.0.0 +Microsoft.AspNetCore.Server.Kestrel|10.0.0 +Microsoft.AspNetCore.Server.Kestrel.Transport.NamedPipes|10.0.0 +Microsoft.AspNetCore.Server.Kestrel.Transport.Quic|10.0.0 +Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets|10.0.0 +Microsoft.AspNetCore.Session|10.0.0 +Microsoft.AspNetCore.SignalR.Common|10.0.0 +Microsoft.AspNetCore.SignalR.Core|10.0.0 +Microsoft.AspNetCore.SignalR|10.0.0 +Microsoft.AspNetCore.SignalR.Protocols.Json|10.0.0 +Microsoft.AspNetCore.StaticAssets|10.0.0 +Microsoft.AspNetCore.StaticFiles|10.0.0 +Microsoft.AspNetCore.WebSockets|10.0.0 +Microsoft.AspNetCore.WebUtilities|10.0.0 +Microsoft.Extensions.Configuration.KeyPerFile|10.0.0 +Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions|10.0.0 +Microsoft.Extensions.Diagnostics.HealthChecks|10.0.0 +Microsoft.Extensions.Features|10.0.0 +Microsoft.Extensions.Identity.Core|10.0.0 +Microsoft.Extensions.Identity.Stores|10.0.0 +Microsoft.Extensions.Localization.Abstractions|10.0.0 +Microsoft.Extensions.Localization|10.0.0 +Microsoft.Extensions.ObjectPool|10.0.0 +Microsoft.Extensions.Validation|10.0.0 +Microsoft.Extensions.WebEncoders|10.0.0 +Microsoft.JSInterop|10.0.0 +Microsoft.Net.Http.Headers|10.0.0 +Microsoft.AspNetCore.App|10.0.0 diff --git a/src/Layout/redist/PrunePackageData/10.0/Microsoft.NETCore.App/PackageOverrides.txt b/src/Layout/redist/PrunePackageData/10.0/Microsoft.NETCore.App/PackageOverrides.txt new file mode 100644 index 000000000000..4ca6bad7e317 --- /dev/null +++ b/src/Layout/redist/PrunePackageData/10.0/Microsoft.NETCore.App/PackageOverrides.txt @@ -0,0 +1,272 @@ +Microsoft.CSharp|4.7.0 +Microsoft.VisualBasic|10.4.0 +Microsoft.Win32.Primitives|4.3.0 +Microsoft.Win32.Registry|5.0.0 +runtime.any.System.Collections|4.3.0 +runtime.any.System.Diagnostics.Tools|4.3.0 +runtime.any.System.Diagnostics.Tracing|4.3.0 +runtime.any.System.Globalization|4.3.0 +runtime.any.System.Globalization.Calendars|4.3.0 +runtime.any.System.IO|4.3.0 +runtime.any.System.Reflection|4.3.0 +runtime.any.System.Reflection.Extensions|4.3.0 +runtime.any.System.Reflection.Primitives|4.3.0 +runtime.any.System.Resources.ResourceManager|4.3.0 +runtime.any.System.Runtime|4.3.1 +runtime.any.System.Runtime.Handles|4.3.0 +runtime.any.System.Runtime.InteropServices|4.3.0 +runtime.any.System.Text.Encoding|4.3.0 +runtime.any.System.Text.Encoding.Extensions|4.3.0 +runtime.any.System.Threading.Tasks|4.3.0 +runtime.any.System.Threading.Timer|4.3.0 +runtime.aot.System.Collections|4.3.0 +runtime.aot.System.Diagnostics.Tools|4.3.0 +runtime.aot.System.Diagnostics.Tracing|4.3.0 +runtime.aot.System.Globalization|4.3.0 +runtime.aot.System.Globalization.Calendars|4.3.0 +runtime.aot.System.IO|4.3.0 +runtime.aot.System.Reflection|4.3.0 +runtime.aot.System.Reflection.Extensions|4.3.0 +runtime.aot.System.Reflection.Primitives|4.3.0 +runtime.aot.System.Resources.ResourceManager|4.3.0 +runtime.aot.System.Runtime|4.3.1 +runtime.aot.System.Runtime.Handles|4.3.0 +runtime.aot.System.Runtime.InteropServices|4.3.0 +runtime.aot.System.Text.Encoding|4.3.0 +runtime.aot.System.Text.Encoding.Extensions|4.3.0 +runtime.aot.System.Threading.Tasks|4.3.0 +runtime.aot.System.Threading.Timer|4.3.0 +runtime.debian.8-x64.runtime.native.System|4.3.1 +runtime.debian.8-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.debian.8-x64.runtime.native.System.Net.Http|4.3.1 +runtime.debian.8-x64.runtime.native.System.Net.Security|4.3.1 +runtime.debian.8-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.debian.9-x64.runtime.native.System|4.3.1 +runtime.debian.9-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.debian.9-x64.runtime.native.System.Net.Http|4.3.1 +runtime.debian.9-x64.runtime.native.System.Net.Security|4.3.1 +runtime.fedora.23-x64.runtime.native.System|4.3.1 +runtime.fedora.23-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.fedora.23-x64.runtime.native.System.Net.Http|4.3.1 +runtime.fedora.23-x64.runtime.native.System.Net.Security|4.3.1 +runtime.fedora.23-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.fedora.24-x64.runtime.native.System|4.3.1 +runtime.fedora.24-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.fedora.24-x64.runtime.native.System.Net.Http|4.3.1 +runtime.fedora.24-x64.runtime.native.System.Net.Security|4.3.1 +runtime.fedora.24-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.fedora.27-x64.runtime.native.System|4.3.1 +runtime.fedora.27-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.fedora.27-x64.runtime.native.System.Net.Http|4.3.1 +runtime.fedora.27-x64.runtime.native.System.Net.Security|4.3.1 +runtime.fedora.28-x64.runtime.native.System|4.3.1 +runtime.fedora.28-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.fedora.28-x64.runtime.native.System.Net.Http|4.3.1 +runtime.fedora.28-x64.runtime.native.System.Net.Security|4.3.1 +runtime.opensuse.13.2-x64.runtime.native.System|4.3.1 +runtime.opensuse.13.2-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.opensuse.13.2-x64.runtime.native.System.Net.Http|4.3.1 +runtime.opensuse.13.2-x64.runtime.native.System.Net.Security|4.3.1 +runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.opensuse.42.1-x64.runtime.native.System|4.3.1 +runtime.opensuse.42.1-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.opensuse.42.1-x64.runtime.native.System.Net.Http|4.3.1 +runtime.opensuse.42.1-x64.runtime.native.System.Net.Security|4.3.1 +runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.opensuse.42.3-x64.runtime.native.System|4.3.1 +runtime.opensuse.42.3-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.opensuse.42.3-x64.runtime.native.System.Net.Http|4.3.1 +runtime.opensuse.42.3-x64.runtime.native.System.Net.Security|4.3.1 +runtime.osx.10.10-x64.runtime.native.System|4.3.1 +runtime.osx.10.10-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.osx.10.10-x64.runtime.native.System.Net.Http|4.3.1 +runtime.osx.10.10-x64.runtime.native.System.Net.Security|4.3.1 +runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple|4.3.1 +runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.rhel.7-x64.runtime.native.System|4.3.1 +runtime.rhel.7-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.rhel.7-x64.runtime.native.System.Net.Http|4.3.1 +runtime.rhel.7-x64.runtime.native.System.Net.Security|4.3.1 +runtime.rhel.7-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.ubuntu.14.04-x64.runtime.native.System|4.3.1 +runtime.ubuntu.14.04-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.ubuntu.14.04-x64.runtime.native.System.Net.Http|4.3.1 +runtime.ubuntu.14.04-x64.runtime.native.System.Net.Security|4.3.1 +runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.ubuntu.16.04-x64.runtime.native.System|4.3.1 +runtime.ubuntu.16.04-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.ubuntu.16.04-x64.runtime.native.System.Net.Http|4.3.1 +runtime.ubuntu.16.04-x64.runtime.native.System.Net.Security|4.3.1 +runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.ubuntu.16.10-x64.runtime.native.System|4.3.1 +runtime.ubuntu.16.10-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.ubuntu.16.10-x64.runtime.native.System.Net.Http|4.3.1 +runtime.ubuntu.16.10-x64.runtime.native.System.Net.Security|4.3.1 +runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography|4.3.4 +runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl|4.3.3 +runtime.ubuntu.18.04-x64.runtime.native.System|4.3.1 +runtime.ubuntu.18.04-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.ubuntu.18.04-x64.runtime.native.System.Net.Http|4.3.1 +runtime.ubuntu.18.04-x64.runtime.native.System.Net.Security|4.3.1 +runtime.unix.Microsoft.Win32.Primitives|4.3.0 +runtime.unix.System.Console|4.3.1 +runtime.unix.System.Diagnostics.Debug|4.3.0 +runtime.unix.System.IO.FileSystem|4.3.0 +runtime.unix.System.Net.Primitives|4.3.0 +runtime.unix.System.Net.Sockets|4.3.0 +runtime.unix.System.Private.Uri|4.3.1 +runtime.unix.System.Runtime.Extensions|4.3.1 +runtime.win.Microsoft.Win32.Primitives|4.3.0 +runtime.win.System.Console|4.3.1 +runtime.win.System.Diagnostics.Debug|4.3.0 +runtime.win.System.IO.FileSystem|4.3.0 +runtime.win.System.Net.Primitives|4.3.0 +runtime.win.System.Net.Sockets|4.3.0 +runtime.win.System.Runtime.Extensions|4.3.1 +runtime.win10-arm64.runtime.native.System.IO.Compression|4.3.2 +runtime.win10-arm-aot.runtime.native.System.IO.Compression|4.0.1 +runtime.win10-x64-aot.runtime.native.System.IO.Compression|4.0.1 +runtime.win10-x86-aot.runtime.native.System.IO.Compression|4.0.1 +runtime.win7.System.Private.Uri|4.3.1 +runtime.win7-x64.runtime.native.System.IO.Compression|4.3.2 +runtime.win7-x86.runtime.native.System.IO.Compression|4.3.2 +runtime.win8-arm.runtime.native.System.IO.Compression|4.3.2 +System.AppContext|4.3.0 +System.Buffers|5.0.0 +System.Collections|4.3.0 +System.Collections.Concurrent|4.3.0 +System.Collections.Immutable|10.0.0 +System.Collections.NonGeneric|4.3.0 +System.Collections.Specialized|4.3.0 +System.ComponentModel|4.3.0 +System.ComponentModel.Annotations|4.3.0 +System.ComponentModel.EventBasedAsync|4.3.0 +System.ComponentModel.Primitives|4.3.0 +System.ComponentModel.TypeConverter|4.3.0 +System.Console|4.3.1 +System.Data.Common|4.3.0 +System.Data.DataSetExtensions|4.4.0 +System.Diagnostics.Contracts|4.3.0 +System.Diagnostics.Debug|4.3.0 +System.Diagnostics.DiagnosticSource|10.0.0 +System.Diagnostics.FileVersionInfo|4.3.0 +System.Diagnostics.Process|4.3.0 +System.Diagnostics.StackTrace|4.3.0 +System.Diagnostics.TextWriterTraceListener|4.3.0 +System.Diagnostics.Tools|4.3.0 +System.Diagnostics.TraceSource|4.3.0 +System.Diagnostics.Tracing|4.3.0 +System.Drawing.Primitives|4.3.0 +System.Dynamic.Runtime|4.3.0 +System.Formats.Asn1|10.0.0 +System.Formats.Tar|10.0.0 +System.Globalization|4.3.0 +System.Globalization.Calendars|4.3.0 +System.Globalization.Extensions|4.3.0 +System.IO|4.3.0 +System.IO.Compression|4.3.0 +System.IO.Compression.ZipFile|4.3.0 +System.IO.FileSystem|4.3.0 +System.IO.FileSystem.AccessControl|4.4.0 +System.IO.FileSystem.DriveInfo|4.3.1 +System.IO.FileSystem.Primitives|4.3.0 +System.IO.FileSystem.Watcher|4.3.0 +System.IO.IsolatedStorage|4.3.0 +System.IO.MemoryMappedFiles|4.3.0 +System.IO.Pipelines|10.0.0 +System.IO.Pipes|4.3.0 +System.IO.Pipes.AccessControl|5.0.0 +System.IO.UnmanagedMemoryStream|4.3.0 +System.Linq|4.3.0 +System.Linq.AsyncEnumerable|10.0.0 +System.Linq.Expressions|4.3.0 +System.Linq.Parallel|4.3.0 +System.Linq.Queryable|4.3.0 +System.Memory|5.0.0 +System.Net.Http|4.3.4 +System.Net.Http.Json|10.0.0 +System.Net.NameResolution|4.3.0 +System.Net.NetworkInformation|4.3.0 +System.Net.Ping|4.3.0 +System.Net.Primitives|4.3.1 +System.Net.Requests|4.3.0 +System.Net.Security|4.3.2 +System.Net.ServerSentEvents|10.0.0 +System.Net.Sockets|4.3.0 +System.Net.WebHeaderCollection|4.3.0 +System.Net.WebSockets|4.3.0 +System.Net.WebSockets.Client|4.3.2 +System.Numerics.Vectors|5.0.0 +System.ObjectModel|4.3.0 +System.Private.DataContractSerialization|4.3.0 +System.Private.Uri|4.3.2 +System.Reflection|4.3.0 +System.Reflection.DispatchProxy|6.0.0 +System.Reflection.Emit|4.7.0 +System.Reflection.Emit.ILGeneration|4.7.0 +System.Reflection.Emit.Lightweight|4.7.0 +System.Reflection.Extensions|4.3.0 +System.Reflection.Metadata|10.0.0 +System.Reflection.Primitives|4.3.0 +System.Reflection.TypeExtensions|4.3.0 +System.Resources.Reader|4.3.0 +System.Resources.ResourceManager|4.3.0 +System.Resources.Writer|4.3.0 +System.Runtime|4.3.1 +System.Runtime.CompilerServices.Unsafe|7.0.0 +System.Runtime.CompilerServices.VisualC|4.3.0 +System.Runtime.Extensions|4.3.1 +System.Runtime.Handles|4.3.0 +System.Runtime.InteropServices|4.3.0 +System.Runtime.InteropServices.RuntimeInformation|4.3.0 +System.Runtime.Loader|4.3.0 +System.Runtime.Numerics|4.3.0 +System.Runtime.Serialization.Formatters|4.3.0 +System.Runtime.Serialization.Json|4.3.0 +System.Runtime.Serialization.Primitives|4.3.0 +System.Runtime.Serialization.Xml|4.3.0 +System.Security.AccessControl|6.0.1 +System.Security.Claims|4.3.0 +System.Security.Cryptography.Algorithms|4.3.1 +System.Security.Cryptography.Cng|5.0.0 +System.Security.Cryptography.Csp|4.3.0 +System.Security.Cryptography.Encoding|4.3.0 +System.Security.Cryptography.OpenSsl|5.0.0 +System.Security.Cryptography.Primitives|4.3.0 +System.Security.Cryptography.X509Certificates|4.3.2 +System.Security.Principal|4.3.0 +System.Security.Principal.Windows|5.0.0 +System.Security.SecureString|4.3.0 +System.Text.Encoding|4.3.0 +System.Text.Encoding.CodePages|10.0.0 +System.Text.Encoding.Extensions|4.3.0 +System.Text.Encodings.Web|10.0.0 +System.Text.Json|10.0.0 +System.Text.RegularExpressions|4.3.1 +System.Threading|4.3.0 +System.Threading.AccessControl|10.0.0 +System.Threading.Channels|10.0.0 +System.Threading.Overlapped|4.3.0 +System.Threading.Tasks|4.3.0 +System.Threading.Tasks.Dataflow|10.0.0 +System.Threading.Tasks.Extensions|5.0.0 +System.Threading.Tasks.Parallel|4.3.0 +System.Threading.Thread|4.3.0 +System.Threading.ThreadPool|4.3.0 +System.Threading.Timer|4.3.0 +System.ValueTuple|4.5.0 +System.Xml.ReaderWriter|4.3.1 +System.Xml.XDocument|4.3.0 +System.Xml.XmlDocument|4.3.0 +System.Xml.XmlSerializer|4.3.0 +System.Xml.XPath|4.3.0 +System.Xml.XPath.XDocument|5.0.0 diff --git a/src/Layout/redist/PrunePackageData/10.0/Microsoft.WindowsDesktop.App/PackageOverrides.txt b/src/Layout/redist/PrunePackageData/10.0/Microsoft.WindowsDesktop.App/PackageOverrides.txt new file mode 100644 index 000000000000..7ba28b54a9dd --- /dev/null +++ b/src/Layout/redist/PrunePackageData/10.0/Microsoft.WindowsDesktop.App/PackageOverrides.txt @@ -0,0 +1,16 @@ +Microsoft.Win32.Registry.AccessControl|10.0.0 +Microsoft.Win32.SystemEvents|10.0.0 +System.CodeDom|10.0.0 +System.Configuration.ConfigurationManager|10.0.0 +System.Diagnostics.EventLog|10.0.0 +System.Diagnostics.PerformanceCounter|10.0.0 +System.DirectoryServices|10.0.0 +System.Formats.Nrbf|10.0.0 +System.IO.Packaging|10.0.0 +System.Resources.Extensions|10.0.0 +System.Security.Cryptography.Pkcs|10.0.0 +System.Security.Cryptography.ProtectedData|10.0.0 +System.Security.Cryptography.Xml|10.0.0 +System.Security.Permissions|10.0.0 +System.Windows.Extensions|10.0.0 +System.Drawing.Common|10.0.0 \ No newline at end of file diff --git a/src/Layout/redist/roslyn-entitlements.plist b/src/Layout/redist/roslyn-entitlements.plist new file mode 100644 index 000000000000..168fce4fcd87 --- /dev/null +++ b/src/Layout/redist/roslyn-entitlements.plist @@ -0,0 +1,16 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-dyld-environment-variables + + com.apple.security.cs.disable-library-validation + + com.apple.security.cs.debugger + + com.apple.security.get-task-allow + + + diff --git a/src/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets index 77fae4e802bd..edcf0a6b474d 100644 --- a/src/Layout/redist/targets/BundledSdks.targets +++ b/src/Layout/redist/targets/BundledSdks.targets @@ -1,7 +1,6 @@ - diff --git a/src/Layout/redist/targets/BundledTemplates.targets b/src/Layout/redist/targets/BundledTemplates.targets index d57efe98784d..bd5cc5995f56 100644 --- a/src/Layout/redist/targets/BundledTemplates.targets +++ b/src/Layout/redist/targets/BundledTemplates.targets @@ -1,10 +1,10 @@ - - - - - + + + + + @@ -57,12 +57,11 @@ + DestinationFolder="$(RedistInstallerLayoutPath)templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" /> - %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) + %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) - %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) + %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) %(CurrentVersionBundledTemplates.TemplateFrameworkVersion) $(InstallerOutputDirectory)Sdks\Microsoft.NET.Sdk\analyzers\ $(InstallerOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\ $(InstallerOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\ - $(InstallerOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\ $(InstallerOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\source-generators\ $(InstallerOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\ $(InstallerOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\ @@ -74,7 +73,6 @@ - @@ -141,7 +139,6 @@ - @@ -200,6 +197,7 @@ + diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets index d7930e4ad125..57a4d0e05b11 100644 --- a/src/Layout/redist/targets/GenerateBundledVersions.targets +++ b/src/Layout/redist/targets/GenerateBundledVersions.targets @@ -704,7 +704,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" - RuntimePackRuntimeIdentifiers="@(Net100RuntimePackRids, '%3B')" + RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" /> + + + + @@ -495,6 +504,7 @@ + diff --git a/src/Layout/redist/targets/GeneratePackagePruneData.targets b/src/Layout/redist/targets/GeneratePackagePruneData.targets index f414f6582c75..0ac14c0590ef 100644 --- a/src/Layout/redist/targets/GeneratePackagePruneData.targets +++ b/src/Layout/redist/targets/GeneratePackagePruneData.targets @@ -21,6 +21,10 @@ + + + + - + + + + + + + <_ExistingPackageDownload Include="@(PackageDownload)" Version="$([System.String]::Copy('%(Version)').Trim('[]'))" /> + + + + - + + + - + + + + + + + + + + + diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets index 19505de69d50..787a8502d628 100644 --- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets +++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets @@ -9,7 +9,7 @@ - + diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif index 5c266abfe069..c3d256fa6d29 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif @@ -5,7 +5,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers", - "version": "10.0.100", + "version": "11.0.100", "language": "en-US" }, "rules": { @@ -708,7 +708,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.NetAnalyzers", - "version": "10.0.100", + "version": "11.0.100", "language": "en-US" }, "rules": { @@ -6603,7 +6603,7 @@ { "tool": { "name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers", - "version": "10.0.100", + "version": "11.0.100", "language": "en-US" }, "rules": { diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/CollatePackageDownloads.cs b/src/Tasks/Microsoft.NET.Build.Tasks/CollatePackageDownloads.cs index e7cfea187193..ce2806f8d532 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/CollatePackageDownloads.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/CollatePackageDownloads.cs @@ -19,7 +19,7 @@ public class CollatePackageDownloads : TaskBase public ITaskItem[] Packages { get; set; } [Output] - public ITaskItem [] PackageDownloads { get; set; } + public ITaskItem[] PackageDownloads { get; set; } protected override void ExecuteCore() { @@ -28,7 +28,7 @@ protected override void ExecuteCore() { var packageDownloadItem = new TaskItem(g.Key); packageDownloadItem.SetMetadata("Version", string.Join(";", - g.Select(p => "[" + p.GetMetadata("Version") + "]"))); + g.Select(p => "[" + p.GetMetadata("Version").Trim('[', ']') + "]"))); return packageDownloadItem; }).ToArray(); } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs index bd0cd0107fab..f7e1dac8b38b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs @@ -250,15 +250,12 @@ static Dictionary LoadPackagesToPruneFromFrameworkPackages static Dictionary LoadPackagesToPruneFromPrunePackageData(string targetFrameworkIdentifier, string targetFrameworkVersion, string frameworkReference, string prunePackageDataRoot) { - if (frameworkReference.Equals("Microsoft.NETCore.App", StringComparison.OrdinalIgnoreCase)) + string packageOverridesPath = Path.Combine(prunePackageDataRoot, targetFrameworkVersion, frameworkReference, "PackageOverrides.txt"); + if (File.Exists(packageOverridesPath)) { - string packageOverridesPath = Path.Combine(prunePackageDataRoot, targetFrameworkVersion, frameworkReference, "PackageOverrides.txt"); - if (File.Exists(packageOverridesPath)) - { - var packageOverrideLines = File.ReadAllLines(packageOverridesPath); - var overrides = PackageOverride.CreateOverriddenPackages(packageOverrideLines); - return overrides.ToDictionary(o => o.id, o => o.version); - } + var packageOverrideLines = File.ReadAllLines(packageOverridesPath); + var overrides = PackageOverride.CreateOverriddenPackages(packageOverrideLines); + return overrides.ToDictionary(o => o.id, o => o.version); } return null; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index 157fde746f9d..d32804d3ee51 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -56,7 +56,8 @@ - + + @@ -131,17 +132,12 @@ - <_NugetBuildTasksPackPath>$(NuGetPackageRoot)nuget.build.tasks.pack\$(NuGetBuildTasksPackageVersion) <_Stage0SdksFolder>$(DOTNET_INSTALL_DIR)\sdk\$(NETCoreSdkVersion)\Sdks %(None.PackagePath)\%(None.RecursiveDir)%(None.Filename)%(None.Extension) - - - ..\NuGet.Build.Tasks.Pack\%(PackFile.RecursiveDir)%(PackFile.Filename)%(PackFile.Extension) - diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets index 841a3654e9ea..3c8ce290c016 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets @@ -46,8 +46,7 @@ Copyright (c) .NET Foundation. All rights reserved. - $(MSBuildThisFileDirectory)..\..\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets - $(MSBuildThisFileDirectory)..\..\NuGet.Build.Tasks.Pack\build\NuGet.Build.Tasks.Pack.targets + $(MSBuildThisFileDirectory)..\..\..\NuGet.Build.Tasks.Pack.targets true diff --git a/src/Tasks/sdk-tasks/EnvironmentVariableFilter.cs b/src/Tasks/sdk-tasks/EnvironmentVariableFilter.cs index 635f78f346a0..a0c55412dfe4 100644 --- a/src/Tasks/sdk-tasks/EnvironmentVariableFilter.cs +++ b/src/Tasks/sdk-tasks/EnvironmentVariableFilter.cs @@ -27,7 +27,6 @@ public class EnvironmentFilter { "DOTNET_CLI_TELEMETRY_SESSIONID", "DOTNET_CLI_UI_LANGUAGE", - "DOTNET_MULTILEVEL_LOOKUP", "DOTNET_RUNTIME_ID", "NUGET_PACKAGES" }; diff --git a/test/Microsoft.NET.TestFramework/TestContext.cs b/test/Microsoft.NET.TestFramework/TestContext.cs index f75e170b195a..d6e73cacfd63 100644 --- a/test/Microsoft.NET.TestFramework/TestContext.cs +++ b/test/Microsoft.NET.TestFramework/TestContext.cs @@ -112,8 +112,6 @@ public static string GetRuntimeGraphFilePath() public void AddTestEnvironmentVariables(IDictionary environment) { - environment["DOTNET_MULTILEVEL_LOOKUP"] = "0"; - // Set NUGET_PACKAGES environment variable to match value from build.ps1 if(NuGetCachePath is not null) { @@ -141,8 +139,6 @@ public static void Initialize(TestCommandLine commandLine) Environment.SetEnvironmentVariable(name, value); } - Environment.SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0"); - // Reset this environment variable so that if the dotnet under test is different than the // one running the tests, it won't interfere Environment.SetEnvironmentVariable("MSBuildSdksPath", null); From 4786415d062942978630eec09840abc645eae782 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Dec 2025 13:38:44 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/dotnet build 295059 Updated Dependencies: dotnet-dev-certs, dotnet-user-jwts, dotnet-user-secrets, Microsoft.AspNetCore.Analyzers, Microsoft.AspNetCore.App.Ref, Microsoft.AspNetCore.App.Ref.Internal, Microsoft.AspNetCore.Authentication.Facebook, Microsoft.AspNetCore.Authentication.Google, Microsoft.AspNetCore.Authentication.MicrosoftAccount, Microsoft.AspNetCore.Authorization, Microsoft.AspNetCore.Components, Microsoft.AspNetCore.Components.Analyzers, Microsoft.AspNetCore.Components.Forms, Microsoft.AspNetCore.Components.SdkAnalyzers, Microsoft.AspNetCore.Components.Web, Microsoft.AspNetCore.Components.WebAssembly, Microsoft.AspNetCore.Components.WebAssembly.Server, Microsoft.AspNetCore.Components.WebView, Microsoft.AspNetCore.DeveloperCertificates.XPlat, Microsoft.AspNetCore.Metadata, Microsoft.AspNetCore.Mvc.Analyzers, Microsoft.AspNetCore.Mvc.Api.Analyzers, Microsoft.AspNetCore.TestHost, Microsoft.Bcl.AsyncInterfaces, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Embedded, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.ObjectPool, Microsoft.JSInterop, Microsoft.NET.HostModel, Microsoft.NET.ILLink.Tasks, Microsoft.NET.Runtime.Emscripten.3.1.56.Cache.win-x64, Microsoft.NET.Sdk.WindowsDesktop, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Win32.SystemEvents, Microsoft.WindowsDesktop.App.Internal, Microsoft.WindowsDesktop.App.Ref, System.CodeDom, System.ComponentModel.Composition, System.Composition.AttributedModel, System.Composition.Convention, System.Composition.Hosting, System.Composition.Runtime, System.Composition.TypedParts, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Formats.Asn1, System.IO.Hashing, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Security.Cryptography.Pkcs, System.Security.Cryptography.ProtectedData, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encoding.CodePages, System.Text.Json, System.Windows.Extensions (Version 10.0.0-rc.1.25515.110 -> 11.0.0-alpha.1.25617.108) Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25515.110 -> 10.0.0-preview.25617.108) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.1.0-preview-25515-110 -> 18.3.0-preview-25617-108) 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.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-preview.1.1610 -> 7.3.0-preview.1.11808) Microsoft.Build.Tasks.Git, Microsoft.SourceLink.AzureRepos.Git, Microsoft.SourceLink.Bitbucket.Git, Microsoft.SourceLink.Common, Microsoft.SourceLink.GitHub, Microsoft.SourceLink.GitLab (Version 10.0.0-beta.25515.110 -> 11.0.100-alpha.25617.108) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.3.0-1.25515.110 -> 5.3.0-1.25617.108) Microsoft.Deployment.DotNet.Releases (Version 2.0.0-preview.1.25515.110 -> 2.0.0-preview.1.25617.108) Microsoft.DiaSymReader (Version 2.2.0-beta.25515.110 -> 3.0.0-alpha.25617.108) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.25515.110 -> 11.0.0-beta.25617.108) MSTest (Version 4.1.0-preview.25551.1 -> 4.1.0-preview.25575.3) Microsoft.Testing.Platform (Version 2.1.0-preview.25551.1 -> 2.1.0-preview.25575.3) Microsoft.FSharp.Compiler (Version 14.0.0-alpha1.25515.110 -> 15.1.200-servicing.25617.108) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 11.0.100-alpha.25515.110 -> 11.0.100-alpha.25617.108) Microsoft.Web.Xdt (Version 3.2.0-preview.25515.110 -> 3.3.0-preview.25617.108) System.CommandLine (Version 2.0.0-rc.1.25515.110 -> 3.0.0-alpha.1.25617.108) Added Dependencies: Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.Dotnet.Wpf.ProjectTemplates, Microsoft.DotNet.Web.ItemTemplates.11.0, Microsoft.DotNet.Web.ProjectTemplates.11.0 (Version 11.0.0-alpha.1.25617.108) Removed Dependencies: Microsoft.DotNet.Web.ItemTemplates.10.0, Microsoft.DotNet.Web.ProjectTemplates.10.0 (Version 10.0.0-rc.1.25515.110) --- eng/Version.Details.props | 272 ++++----- eng/Version.Details.xml | 546 +++++++++--------- eng/common/SetupNugetSources.sh | 6 +- eng/common/core-templates/job/job.yml | 2 + .../job/publish-build-assets.yml | 30 +- .../core-templates/job/source-build.yml | 4 +- .../job/source-index-stage1.yml | 8 +- .../core-templates/post-build/post-build.yml | 459 ++++++++------- .../steps/install-microbuild-impl.yml | 6 +- .../steps/install-microbuild.yml | 29 +- .../core-templates/steps/publish-logs.yml | 4 +- .../steps/source-index-stage1-publish.yml | 4 +- eng/common/generate-sbom-prep.sh | 0 eng/common/internal-feed-operations.ps1 | 2 +- eng/common/native/install-dependencies.sh | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 +- eng/common/post-build/redact-logs.ps1 | 4 +- eng/common/sdk-task.ps1 | 4 +- eng/common/tools.ps1 | 27 +- eng/common/tools.sh | 4 - global.json | 6 +- 22 files changed, 747 insertions(+), 678 deletions(-) mode change 100755 => 100644 eng/common/generate-sbom-prep.sh diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 91a79483b9b9..3d1c9d752708 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,142 +6,144 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-preview.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 18.1.0-preview-25515-110 - 18.1.0-preview-25515-110 - 7.0.0-preview.1.1610 - 10.0.0-beta.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 10.0.0-preview.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 2.0.0-preview.1.25515.110 - 2.2.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 11.0.0-beta.25515.110 - 11.0.0-beta.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 14.0.0-alpha1.25515.110 - 10.0.0-rc.1.25515.110 - 5.3.0-1.25515.110 - 5.3.0-1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 10.0.0-preview.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 18.3.0-preview-25617-108 + 18.3.0-preview-25617-108 + 7.3.0-preview.1.11808 + 11.0.100-alpha.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 10.0.0-preview.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 2.0.0-preview.1.25617.108 + 3.0.0-alpha.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-beta.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 15.1.200-servicing.25617.108 + 11.0.0-alpha.1.25617.108 + 5.3.0-1.25617.108 + 5.3.0-1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 10.0.0-preview.7.25377.103 - 10.0.0-preview.25515.110 - 10.0.0-rc.1.25515.110 - 18.1.0-preview-25515-110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 10.0.0-beta.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 11.0.100-alpha.25515.110 - 18.1.0-preview-25515-110 - 18.1.0-preview-25515-110 - 3.2.0-preview.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 7.0.0-preview.1.1610 - 10.0.0-rc.1.25515.110 - 2.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 - 10.0.0-rc.1.25515.110 + 10.0.0-preview.25617.108 + 11.0.0-alpha.1.25617.108 + 18.3.0-preview-25617-108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 11.0.100-alpha.25617.108 + 18.3.0-preview-25617-108 + 18.3.0-preview-25617-108 + 3.3.0-preview.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 7.3.0-preview.1.11808 + 11.0.0-alpha.1.25617.108 + 3.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 + 11.0.0-alpha.1.25617.108 2.1.0 - 2.1.0-preview.25551.1 - 4.1.0-preview.25551.1 + 2.1.0-preview.25575.3 + 4.1.0-preview.25575.3 @@ -193,8 +195,10 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotNetWebItemTemplates110PackageVersion) + $(MicrosoftDotNetWebProjectTemplates110PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f4d96261324..b3025e30743d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 - - - https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 - - - https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/microsoft/testfx - 803c90bd9cc6017674a218b5a51a9d4fcf251cdb + 838c4cd634276a89dbfc88f5371d9000252b9299 - + https://github.com/microsoft/testfx - 803c90bd9cc6017674a218b5a51a9d4fcf251cdb + 838c4cd634276a89dbfc88f5371d9000252b9299 - + https://github.com/dotnet/dotnet - be28ec777bf12db631725399c442448d52093087 + 6ec92e489cc9368695fb6a39c2afb55e1a735dec diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef012..b97cc536379d 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -66,10 +66,8 @@ EnableInternalPackageSource() { grep -i " /dev/null if [ "$?" == "0" ]; then echo "Enabling internal source '$PackageSourceName'." - # Remove the disabled entry - local OldDisableValue="" - local NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + # Remove the disabled entry (including any surrounding comments or whitespace on the same line) + sed -i.bak "//d" "$ConfigFile" # Add the source name to PackageSources for credential handling PackageSources+=("$PackageSourceName") diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index cb4ccc023a33..748c4f07a64d 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -73,6 +73,8 @@ jobs: templateContext: ${{ parameters.templateContext }} variables: + - name: AllowPtrToDetectTestRunRetryFiles + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 37dff559fc1b..8b5c635fe807 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -91,8 +91,8 @@ jobs: fetchDepth: 3 clean: true - - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: - - ${{ if eq(parameters.publishingVersion, 3) }}: + - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: + - ${{ if eq(parameters.publishingVersion, 3) }}: - task: DownloadPipelineArtifact@2 displayName: Download Asset Manifests inputs: @@ -117,9 +117,17 @@ jobs: flattenFolders: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: AzureCLI@2 displayName: Publish Build Assets inputs: @@ -132,9 +140,12 @@ jobs: /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' + condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -162,7 +173,7 @@ jobs: artifactName: AssetManifests displayName: 'Publish Merged Manifest' retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + sbomEnabled: false # we don't need SBOM for logs - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: @@ -179,6 +190,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x - task: AzureCLI@2 displayName: Publish Using Darc @@ -195,9 +211,11 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb94..9d820f974211 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,10 +60,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 30530359a5d6..76baf5c27258 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -3,7 +3,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: @@ -41,4 +41,4 @@ jobs: - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml parameters: - binLogPath: ${{ parameters.binLogPath }} \ No newline at end of file + binLogPath: ${{ parameters.binLogPath }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index f6f87fe5c675..06864cd1feb8 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -1,106 +1,106 @@ parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: requireDefaultChannels - displayName: Fail the build if there are no default channel(s) registrations for the current build - type: boolean - default: false - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - - name: isAssetlessBuild - type: boolean - displayName: Is Assetless Build - default: false - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - - - name: is1ESPipeline - type: boolean - default: false +# Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. +# Publishing V1 is no longer supported +# Publishing V2 is no longer supported +# Publishing V3 is the default +- name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + +- name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + +- name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + +- name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + +- name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + +- name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + +- name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + +- name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + +- name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false + +- name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + +- name: isAssetlessBuild + type: boolean + displayName: Is Assetless Build + default: false + +# These parameters let the user customize the call to sdk-task.ps1 for publishing +# symbols & general artifacts as well as for signing validation +- name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + +- name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + +- name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + +# Which stages should finish execution before post-build stages start +- name: validateDependsOn + type: object + default: + - build + +- name: publishDependsOn + type: object + default: + - Validate + +# Optional: Call asset publishing rather than running in a separate stage +- name: publishAssetsImmediately + type: boolean + default: false + +- name: is1ESPipeline + type: boolean + default: false stages: - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: @@ -108,10 +108,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Validate Build Assets variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: NuGet Validation @@ -127,35 +127,35 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation @@ -169,54 +169,54 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: /eng/common/core-templates/steps/publish-logs.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) - job: displayName: SourceLink Validation @@ -230,41 +230,41 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true - ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - stage: publish_using_darc @@ -274,10 +274,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: Publish Using Darc @@ -291,30 +291,41 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: > + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: NuGetAuthenticate@1 + + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + + - task: UseDotNet@2 + inputs: + version: 8.0.x + + - task: AzureCLI@2 + displayName: Publish Using Darc + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' @@ -323,3 +334,5 @@ stages: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml index 9fdf3a116774..b9e0143ee92a 100644 --- a/eng/common/core-templates/steps/install-microbuild-impl.yml +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -20,15 +20,15 @@ parameters: steps: - ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: - task: MicroBuildSigningPluginPreview@4 - displayName: Install Preview MicroBuild plugin (Windows) + displayName: Install Preview MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} condition: ${{ parameters.condition }} - ${{ else }}: - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) + displayName: Install MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} - condition: ${{ parameters.condition }} \ No newline at end of file + condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index bdebec0eaa9b..4f4b56ed2a6b 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,9 +13,8 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true - # Location of the MicroBuild output folder - # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. - microBuildOutputFolder: '$(Build.SourcesDirectory)' + # Microbuild installation directory + microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild # Microbuild version microbuildPluginVersion: 'latest' @@ -30,8 +29,27 @@ steps: inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet - workingDirectory: ${{ parameters.microBuildOutputFolder }} + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + - script: | + set -euo pipefail + + # UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly + version=$(dotnet --version) + cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json + { + "sdk": { + "version": "$version", + "paths": [ + "${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild" + ], + "errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin." + } + } + EOF + displayName: 'Add global.json to MicroBuild Installation path' + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -85,6 +103,7 @@ steps: zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json version: ${{ parameters.microbuildPluginVersion }} + workingDirectory: ${{ parameters.microBuildOutputFolder }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a0..5a927b4c7bcb 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -26,8 +26,10 @@ steps: # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -BinlogToolVersion '${{parameters.BinlogToolVersion}}' -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index eff4573c6e5f..ac019e2d0337 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100755 new mode 100644 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index f7bd4af0c8db..64b87d0bcc3c 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "amzn" ]; then diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1eda208a3bbf..48e55598bdd2 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -7,7 +7,9 @@ param( [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $RequireDefaultChannels, - [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing + [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc19591507..fc0218a013d1 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,7 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 4655af7a2d88..b64b66a6275b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -9,6 +9,8 @@ Param( [switch][Alias('nobl')]$excludeCIBinaryLog, [switch]$noWarnAsError, [switch] $help, + [string] $runtimeSourceFeed = '', + [string] $runtimeSourceFeedKey = '', [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -68,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4bc50bd568ca..f6bde2683794 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - $env:DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we do not need all ASP.NET packages restored. $env:DOTNET_NOLOGO=1 @@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build Write-PipelinePrependPath -Path $dotnetRoot - Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot @@ -277,7 +273,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -394,8 +390,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 - $defaultXCopyMSBuildVersion = '17.14.16' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { @@ -510,7 +506,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,23 +552,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd0f..6c121300ac7d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -115,9 +115,6 @@ function InitializeDotNetCli { local install=$1 - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - export DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we want to control all package sources export DOTNET_NOLOGO=1 @@ -166,7 +163,6 @@ function InitializeDotNetCli { # build steps from using anything other than what we've downloaded. Write-PipelinePrependPath -path "$dotnet_root" - Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value diff --git a/global.json b/global.json index 6e18af32ed70..6b64841b4218 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.100-rc.1.25420.111", + "dotnet": "10.0.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25515.110", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25515.110", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25617.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25617.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From d02744b5513d0e493c7b7fc0cd8ae328f29abdcf Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 18 Dec 2025 11:25:00 -0800 Subject: [PATCH 3/8] Fix missing package version --- eng/Version.Details.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 56a5baa33510..87bdddd674a0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -41,6 +41,7 @@ This file should be imported by eng/Versions.props 5.3.0-1.25617.108 5.3.0-1.25617.108 5.3.0-1.25617.108 + 5.3.0-1.25617.108 5.3.0-1.25617.108 10.0.0-preview.25617.108 5.3.0-1.25617.108 From ff438dfcc3994706980249893ae4b07a59654f77 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 18 Dec 2025 11:37:09 -0800 Subject: [PATCH 4/8] Fix more package errors --- eng/Version.Details.xml | 8 ++++++++ eng/Versions.props | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96335812e264..80aa0e9cb3de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,6 +116,14 @@ https://github.com/dotnet/dotnet 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + https://github.com/dotnet/dotnet 6ec92e489cc9368695fb6a39c2afb55e1a735dec diff --git a/eng/Versions.props b/eng/Versions.props index e6116cd3618b..e9cd99f60c37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -118,11 +118,6 @@ 18.0 - - - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - From c67edafe762308224be0cd6ebb541fe8ac08e7b7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 18 Dec 2025 20:55:46 +0100 Subject: [PATCH 5/8] Update Version.Details.xml --- eng/Version.Details.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80aa0e9cb3de..5fdfe2c0af56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,10 +116,6 @@ https://github.com/dotnet/dotnet 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/dotnet/dotnet - 6ec92e489cc9368695fb6a39c2afb55e1a735dec - https://github.com/dotnet/dotnet 6ec92e489cc9368695fb6a39c2afb55e1a735dec From 88461d2a6f414dc331441c96e4e248cffecfd74d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 18 Dec 2025 21:00:55 +0100 Subject: [PATCH 6/8] Update Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj --- .../src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj index 50e8908a229c..e842a310ec84 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj @@ -89,7 +89,7 @@ <_GenerateDocumentationAndConfigFilesPath>%(_GenerateDocumentationAndConfigFilesPath.Identity) - + - \ No newline at end of file + From 7367851132795be3d2da91b8a62f3024e48e8961 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 18 Dec 2025 21:35:00 +0100 Subject: [PATCH 7/8] Update Exec command to use VersionPrefix --- .../src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj index e842a310ec84..3eaa0406fb36 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj @@ -89,7 +89,7 @@ <_GenerateDocumentationAndConfigFilesPath>%(_GenerateDocumentationAndConfigFilesPath.Identity) - + From 6a14a29ae7af33d749a3a644e3f3592b5b3fd8ed Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 18 Dec 2025 22:56:09 +0100 Subject: [PATCH 8/8] Remove hardcodes and clean-up in BundledTemplates --- .../VS.Redist.Common.NetCore.Templates.proj | 3 +- .../redist/targets/BundledTemplates.targets | 50 ++++++++----------- .../redist/targets/GenerateMSIs.targets | 4 +- .../redist/targets/RestoreLayout.targets | 3 +- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj b/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj index 3ccf85596cef..99aa4dc84a26 100644 --- a/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj +++ b/src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj @@ -17,8 +17,7 @@ - - + diff --git a/src/Layout/redist/targets/BundledTemplates.targets b/src/Layout/redist/targets/BundledTemplates.targets index bbfcae6f7bba..2ffda56ec77e 100644 --- a/src/Layout/redist/targets/BundledTemplates.targets +++ b/src/Layout/redist/targets/BundledTemplates.targets @@ -1,25 +1,28 @@ - - - - - + + + $(MajorMinorVersion) + + + + + + + - - - - - %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLowerInvariant()) - + + - + @@ -29,19 +32,9 @@ <_ArcadePatchNumber>$([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000')) - - @@ -51,8 +44,7 @@ - - $(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension) + $(ArtifactsNonShippingPackagesDir)%(TemplatesComponents.TemplateBaseFilename)-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) @@ -87,10 +79,10 @@ %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) - %(CurrentVersionBundledTemplates.TemplateFrameworkVersion) + %(BundledTemplate.TemplateFrameworkVersion) - + \ No newline at end of file diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 6bb8b5515902..83f98054da4b 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -223,9 +223,7 @@ Outputs="$(SdkBundleFile)"> - - - + diff --git a/src/Layout/redist/targets/RestoreLayout.targets b/src/Layout/redist/targets/RestoreLayout.targets index 7538eb243aef..b5cbd8993fc8 100644 --- a/src/Layout/redist/targets/RestoreLayout.targets +++ b/src/Layout/redist/targets/RestoreLayout.targets @@ -29,8 +29,7 @@ windowsdesktop-targeting-pack-$(MicrosoftWindowsDesktopAppRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(ArtifactNameWithVersionSdk)$(InstallerExtension) - - dotnet-100templates-10.0.100-rtm-$(ProductMonikerRid)$(InstallerExtension) + dotnet-$(VersionMajor)$(VersionMinor)templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension) dotnet-runtime-$(MicrosoftNETCoreAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)