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/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd index 3dc68bb7f8af..7207970c5fe6 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 Ensure Visual Studio instances allow preview SDKs 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 41bba1d7a2b8..2d9b7b3c7c20 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -86,6 +86,9 @@ + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3807961c242b..e42484191ac5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,143 +6,142 @@ This file should be imported by eng/Versions.props - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-preview.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 18.1.0-preview-25567-101 - 18.1.0-preview-25567-101 - 11.0.0-beta.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 10.0.0-preview.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 2.0.0-preview.1.25567.101 - 2.2.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 15.0.0-alpha1.25567.101 - 10.0.0-rc.3.25567.101 - 5.3.0-1.25567.101 - 5.3.0-1.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-preview.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 18.3.0-preview-25603-106 + 18.3.0-preview-25603-106 + 7.0.0-preview.1.10406 + 11.0.100-alpha.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 10.0.0-preview.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 2.0.0-preview.1.25603.106 + 3.0.0-alpha.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 11.0.0-beta.25603.106 + 11.0.0-beta.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 15.1.200-servicing.25603.106 + 10.0.0-rc.3.25603.106 + 5.3.0-1.25603.106 + 5.3.0-1.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 10.0.0-preview.7.25377.103 - 10.0.0-preview.25567.101 - 10.0.0-rc.3.25567.101 - 18.1.0-preview-25567-101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.0-beta.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 11.0.100-alpha.25567.101 - 18.1.0-preview-25567-101 - 18.1.0-preview-25567-101 - 3.2.0-preview.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 3.0.0-alpha.1.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 - 10.0.0-rc.3.25567.101 + 10.0.0-preview.25603.106 + 10.0.0-rc.3.25603.106 + 18.3.0-preview-25603-106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 11.0.100-alpha.25603.106 + 18.3.0-preview-25603-106 + 18.3.0-preview-25603-106 + 3.3.0-preview.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 7.0.0-preview.1.10406 + 10.0.0-rc.3.25603.106 + 3.0.0-alpha.1.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 + 10.0.0-rc.3.25603.106 2.1.0 - - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 - 7.0.0-preview.2.256 2.1.0-preview.25575.3 4.1.0-preview.25575.3 @@ -177,6 +176,7 @@ This file should be imported by eng/Versions.props $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) $(MicrosoftBuildTasksGitPackageVersion) $(MicrosoftCodeAnalysisPackageVersion) $(MicrosoftCodeAnalysisBuildClientPackageVersion) @@ -199,6 +199,8 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetSignToolPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) @@ -243,6 +245,22 @@ This file should be imported by eng/Versions.props $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) $(MicrosoftWindowsDesktopAppRefPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) @@ -267,24 +285,6 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) - - $(MicrosoftBuildNuGetSdkResolverPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae7b79929607..107e2ea60a73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a @@ -68,170 +68,174 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + + https://github.com/dotnet/dotnet + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a + + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a https://github.com/microsoft/testfx @@ -565,9 +573,9 @@ https://github.com/microsoft/testfx 838c4cd634276a89dbfc88f5371d9000252b9299 - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 5bb147b254d359d7cbf7fb4e5ccc231d5ebe3a4a diff --git a/eng/Versions.props b/eng/Versions.props index 32612617d38f..7845d9d300e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,36 +1,33 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + + + 11 0 1 00 + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) + alpha + 1 + + + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)00 $(VersionMajor).$(VersionMinor).100 - $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) 10.0.100 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - - false - release - - alpha - rtm - servicing - 0 + true - true + 30 32 @@ -47,11 +44,13 @@ $(VersionFeature80) $(VersionFeature90) + 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 + @@ -93,6 +95,7 @@ 4.5.4 8.0.0 + @@ -124,15 +128,13 @@ 3.1.12 2.0.23 + 1.10.2 4.0.1 - - - true - + 8.0.2 @@ -142,6 +144,7 @@ 8.0.0-beta.23607.1 0.14.0 + 10.0.100 10.0.0 @@ -151,9 +154,12 @@ 26.0.11017 26.0.11017 + 2.0.1-servicing-26011-01 + + diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 721a5566699f..8b5c635fe807 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -122,8 +122,9 @@ jobs: # Populate internal runtime variables. - template: /eng/common/templates/steps/enable-internal-sources.yml - parameters: - legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) - template: /eng/common/templates/steps/enable-internal-runtimes.yml @@ -140,7 +141,7 @@ jobs: /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -189,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 @@ -205,8 +211,8 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' - -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -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 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..58b7a76814e0 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -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, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 0cea81c74f22..06864cd1feb8 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -127,11 +127,11 @@ 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 @@ -175,7 +175,7 @@ stages: 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: @@ -236,7 +236,7 @@ stages: 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: @@ -305,14 +305,19 @@ stages: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: NuGetAuthenticate@1 # Populate internal runtime variables. + - 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: @@ -330,4 +335,4 @@ stages: -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f60e87e47202..4f4b56ed2a6b 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,6 +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 + # Microbuild installation directory + microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild # Microbuild version microbuildPluginVersion: 'latest' @@ -27,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: | @@ -68,7 +89,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -82,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') }}: @@ -90,7 +112,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) 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/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 9ae443f1c36b..b64b66a6275b 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -70,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..1556562c68f0 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 @@ -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') { 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/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 index 76e2f9d08fe8..97302f3205be 100755 --- a/eng/common/vmr-sync.ps1 +++ b/eng/common/vmr-sync.ps1 @@ -103,7 +103,7 @@ Set-StrictMode -Version Latest Highlight 'Installing .NET, preparing the tooling..' . .\eng\common\tools.ps1 $dotnetRoot = InitializeDotNetCli -install:$true -$darc = Get-Darc "1.1.0-beta.25514.2" +$darc = Get-Darc $dotnet = "$dotnetRoot\dotnet.exe" Highlight "Starting the synchronization of VMR.." diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh index c038012a55aa..44239e331c0c 100755 --- a/eng/common/vmr-sync.sh +++ b/eng/common/vmr-sync.sh @@ -164,7 +164,7 @@ set -e highlight 'Installing .NET, preparing the tooling..' source "./eng/common/tools.sh" InitializeDotNetCli true -GetDarc "1.1.0-beta.25514.2" +GetDarc dotnetDir=$( cd ./.dotnet/; pwd -P ) dotnet=$dotnetDir/dotnet 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/global.json b/global.json index fecc525db30a..bd7a6accbcbf 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.25451.107", + "dotnet": "10.0.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25521.106", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25521.106", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25603.106", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25603.106", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/src/Layout/redist/targets/GeneratePackagePruneData.targets b/src/Layout/redist/targets/GeneratePackagePruneData.targets index 54464d634043..0ac14c0590ef 100644 --- a/src/Layout/redist/targets/GeneratePackagePruneData.targets +++ b/src/Layout/redist/targets/GeneratePackagePruneData.targets @@ -42,10 +42,15 @@ + + + + <_ExistingPackageDownload Include="@(PackageDownload)" Version="$([System.String]::Copy('%(Version)').Trim('[]'))" /> + - + 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);