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..f0af6ed831fe 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -84,6 +84,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4b4c467150b4..87bdddd674a0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,121 +6,140 @@ 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 - 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 + 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 + 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.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.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 @@ -195,8 +214,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 3d7dd39deb2a..5fdfe2c0af56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec @@ -68,170 +68,174 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/nuget/nuget.client - 97c64b5dfcc39b3babf6b3dfa828aa737860c145 + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - - https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e - - - https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e - - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + + https://github.com/dotnet/dotnet + 6ec92e489cc9368695fb6a39c2afb55e1a735dec + + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec https://github.com/microsoft/testfx @@ -565,9 +573,9 @@ https://github.com/microsoft/testfx e183a03b1e200baa83f3b00b83633338d356581a - + https://github.com/dotnet/dotnet - f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e + 6ec92e489cc9368695fb6a39c2afb55e1a735dec diff --git a/eng/Versions.props b/eng/Versions.props index 60d378272929..e9cd99f60c37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,36 +1,32 @@ - - - $(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 + true + 30 32 @@ -47,11 +43,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 +67,16 @@ 1.0.52 + 0.2.0 + 9.4.0 + @@ -93,6 +94,7 @@ 4.5.4 8.0.0 + - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - + @@ -129,15 +127,13 @@ 3.1.12 2.0.23 + 1.10.2 4.0.1 - - - true - + 8.0.2 @@ -147,6 +143,7 @@ 8.0.0-beta.23607.1 0.14.0 + 10.0.100 10.0.0 @@ -156,9 +153,12 @@ 26.0.11017 26.0.11017 + 2.0.1-servicing-26011-01 + + 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/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/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f60e87e47202..d5cc8400b12a 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: | @@ -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') }}: 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/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/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..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/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..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.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.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" diff --git a/src/BuiltInTools/Watch/HotReload/HotReloadEventSource.cs b/src/BuiltInTools/Watch/HotReload/HotReloadEventSource.cs index 04b3dbb70d52..92af26786b5a 100644 --- a/src/BuiltInTools/Watch/HotReload/HotReloadEventSource.cs +++ b/src/BuiltInTools/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/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/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/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets index 5723d50fce8f..0d366f5a5a99 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 c7e277a2b8a9..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) @@ -69,12 +61,11 @@ + DestinationFolder="$(RedistInstallerLayoutPath)templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)" /> - %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) + %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) - %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) - %(CurrentVersionBundledTemplates.TemplateFrameworkVersion) + %(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath) + %(BundledTemplate.TemplateFrameworkVersion) - + \ No newline at end of file diff --git a/src/Layout/redist/targets/GenerateBundledVersions.targets b/src/Layout/redist/targets/GenerateBundledVersions.targets index 77bee14ce8fb..e58500d3ef1e 100644 --- a/src/Layout/redist/targets/GenerateBundledVersions.targets +++ b/src/Layout/redist/targets/GenerateBundledVersions.targets @@ -749,7 +749,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')" /> - - - + 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/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets index 54a82b807a82..b3018ef056f8 100644 --- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets +++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets @@ -9,7 +9,7 @@ - + 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) 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..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) - + - \ No newline at end of file + 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 41de1742689c..c7cf14afb22d 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/GetPackagesToPrune.cs @@ -227,15 +227,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/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);