diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-07-01 08:37:22 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-01 08:37:22 +0300 |
commit | a5e27d0cab52a32b9ddf5f245e47f67569a2082a (patch) | |
tree | 9f2ec955224e867146ad3534b30a7c98fcfdc059 /eng | |
parent | 87cd70c4ea9f0452f52db7dc9fd5bb3564a2e9e6 (diff) |
[main] Update dependencies from 8 repositories (#54907)
* Update dependencies from https://github.com/dotnet/arcade build 20210628.2
Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
From Version 6.0.0-beta.21324.3 -> To Version 6.0.0-beta.21328.2
* Update dependencies from https://github.com/dotnet/icu build 20210628.1
Microsoft.NETCore.Runtime.ICU.Transport
From Version 6.0.0-preview.7.21321.1 -> To Version 6.0.0-preview.7.21328.1
* Update dependencies from https://github.com/dotnet/xharness build 20210628.4
Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit
From Version 1.0.0-prerelease.21328.2 -> To Version 1.0.0-prerelease.21328.4
* Update dependencies from https://github.com/dotnet/llvm-project build 20210628.1
runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
From Version 11.1.0-alpha.1.21321.1 -> To Version 11.1.0-alpha.1.21328.1
* Update dependencies from https://github.com/mono/linker build 20210628.2
Microsoft.NET.ILLink.Tasks
From Version 6.0.100-preview.6.21327.1 -> To Version 6.0.100-preview.6.21328.2
* Update dependencies from https://github.com/dotnet/hotreload-utils build 20210628.1
Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
From Version 1.0.1-alpha.0.21321.1 -> To Version 1.0.1-alpha.0.21328.1
* Update dependencies from https://github.com/dotnet/emsdk build 20210629.1
Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64
From Version 6.0.0-preview.7.21323.1 -> To Version 6.0.0-preview.7.21329.1
* Address new IL3002 and IL3003 warnings for the latest linker to unblock the build.
* Disable the trim analyzer for tests with EnableAggressiveTrimming
* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210629.4
optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR
From Version 1.0.0-prerelease.21320.4 -> To Version 1.0.0-prerelease.21329.4
* Update dependencies from https://github.com/dotnet/arcade build 20210629.8
Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk
From Version 6.0.0-beta.21321.1 -> To Version 6.0.0-beta.21329.8
* Update dependencies from https://github.com/mono/linker build 20210629.2
Microsoft.NET.ILLink.Tasks
From Version 6.0.100-preview.6.21317.4 -> To Version 6.0.100-preview.6.21329.2
* Update dependencies from https://github.com/dotnet/emsdk build 20210630.1
Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64
From Version 6.0.0-preview.7.21323.1 -> To Version 6.0.0-preview.7.21330.1
* Update dependencies from https://github.com/mono/linker build 20210630.1
Microsoft.NET.ILLink.Tasks
From Version 6.0.100-preview.6.21317.4 -> To Version 6.0.100-preview.6.21330.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Version.Details.xml | 140 | ||||
-rw-r--r-- | eng/Versions.props | 62 | ||||
-rw-r--r-- | eng/common/tools.ps1 | 11 | ||||
-rw-r--r-- | eng/testing/tests.mobile.targets | 2 |
4 files changed, 113 insertions, 102 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8b08594ccc..cfe0a882b2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ <Dependencies> <ProductDependencies> - <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-preview.7.21315.3"> + <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-preview.7.21328.1"> <Uri>https://github.com/dotnet/icu</Uri> - <Sha>59588c1257a842089d0b7df3bad1cdd69ac720e1</Sha> + <Sha>e7626ad8c04b150de635f920b5e8dede0aafaf73</Sha> </Dependency> <Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21328.2"> <Uri>https://github.com/dotnet/msquic</Uri> @@ -10,69 +10,69 @@ </Dependency> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01"> <Uri>https://github.com/microsoft/vstest</Uri> @@ -114,37 +114,37 @@ <Uri>https://github.com/dotnet/runtime-assets</Uri> <Sha>8d7b898b96cbdb868cac343e938173105287ed9e</Sha> </Dependency> - <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> - <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> - <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> - <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> - <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> - <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> - <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> - <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21314.1"> + <Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21328.1"> <Uri>https://github.com/dotnet/llvm-project</Uri> - <Sha>4f0293e0a254a2f014643ecbe973b81f26c87fd4</Sha> + <Sha>51c322893cff67a67e503d00e9c328d9d40b6a06</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20451.14"> <Uri>https://github.com/dotnet/runtime</Uri> @@ -178,45 +178,45 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>f891033db5b8ebf651176a3dcc3bec74a217f85e</Sha> </Dependency> - <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21317.4"> + <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21330.1"> <Uri>https://github.com/mono/linker</Uri> - <Sha>c739a81ba553b00df1cb2f5b9974deae996b757a</Sha> + <Sha>f574448d16af45f7ac2c4b89d71dea73dec86726</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21324.2"> + <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21328.4"> <Uri>https://github.com/dotnet/xharness</Uri> - <Sha>49b0eedd8ecb0dea7e00c89097a5cd0f1f584257</Sha> + <Sha>2890d740e1dd9fc41a634777c4af59a3986b1f7b</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21324.2"> + <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21328.4"> <Uri>https://github.com/dotnet/xharness</Uri> - <Sha>49b0eedd8ecb0dea7e00c89097a5cd0f1f584257</Sha> + <Sha>2890d740e1dd9fc41a634777c4af59a3986b1f7b</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21321.1"> + <Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21329.8"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>36b148348ee8312f6369c0c56b0d0fe07deec603</Sha> + <Sha>6b9d24236d8d1906284e6cb6c28e3fe93a69b7d2</Sha> </Dependency> - <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21320.4"> + <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21329.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> - <Sha>f291c7f87a563f29ff2a9af7378495769d97389c</Sha> + <Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha> </Dependency> - <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21320.4"> + <Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21329.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> - <Sha>f291c7f87a563f29ff2a9af7378495769d97389c</Sha> + <Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha> </Dependency> - <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21320.4"> + <Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21329.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> - <Sha>f291c7f87a563f29ff2a9af7378495769d97389c</Sha> + <Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha> </Dependency> - <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21320.4"> + <Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21329.4"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> - <Sha>f291c7f87a563f29ff2a9af7378495769d97389c</Sha> + <Sha>b89374348ff2344a625677584be9dfc9bea2b971</Sha> </Dependency> - <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21323.1"> + <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21330.1"> <Uri>https://github.com/dotnet/emsdk</Uri> - <Sha>617928847d1e11458527b8bbafb5577982291847</Sha> + <Sha>f5349765b7af1970c5b25cce4ed278544907cbe0</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21314.1"> + <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.1-alpha.0.21328.1"> <Uri>https://github.com/dotnet/hotreload-utils</Uri> - <Sha>6adb8ac00a59fe409f232b8b32758aa7d10b4d1d</Sha> + <Sha>2b1536142083d6270dc40c5cba74fbb0a612beab</Sha> </Dependency> <Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.21314.1"> <Uri>https://github.com/dotnet/runtime-assets</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 38d89aaab83..d8104e89eb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,19 +50,19 @@ <MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion> <MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21324.1</MicrosoftCodeAnalysisNetAnalyzersVersion> <!-- Arcade dependencies --> - <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21321.1</MicrosoftDotNetApiCompatVersion> - <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21321.1</MicrosoftDotNetBuildTasksFeedVersion> - <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21321.1</MicrosoftDotNetCodeAnalysisVersion> - <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21321.1</MicrosoftDotNetGenAPIVersion> - <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21321.1</MicrosoftDotNetGenFacadesVersion> - <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21321.1</MicrosoftDotNetXUnitExtensionsVersion> - <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21321.1</MicrosoftDotNetXUnitConsoleRunnerVersion> - <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21321.1</MicrosoftDotNetBuildTasksArchivesVersion> - <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21321.1</MicrosoftDotNetBuildTasksPackagingVersion> - <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21321.1</MicrosoftDotNetBuildTasksInstallersVersion> - <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21321.1</MicrosoftDotNetRemoteExecutorVersion> - <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21321.1</MicrosoftDotNetVersionToolsTasksVersion> - <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21321.1</MicrosoftDotNetPackageTestingVersion> + <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21329.8</MicrosoftDotNetApiCompatVersion> + <MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksFeedVersion> + <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21329.8</MicrosoftDotNetCodeAnalysisVersion> + <MicrosoftDotNetGenAPIVersion>6.0.0-beta.21329.8</MicrosoftDotNetGenAPIVersion> + <MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21329.8</MicrosoftDotNetGenFacadesVersion> + <MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21329.8</MicrosoftDotNetXUnitExtensionsVersion> + <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21329.8</MicrosoftDotNetXUnitConsoleRunnerVersion> + <MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksArchivesVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21329.8</MicrosoftDotNetBuildTasksInstallersVersion> + <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21329.8</MicrosoftDotNetRemoteExecutorVersion> + <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21329.8</MicrosoftDotNetVersionToolsTasksVersion> + <MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21329.8</MicrosoftDotNetPackageTestingVersion> <!-- NuGet dependencies --> <NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion> <!-- Installer dependencies --> @@ -122,10 +122,10 @@ <SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21314.1</SystemSecurityCryptographyX509CertificatesTestDataVersion> <SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21314.1</SystemWindowsExtensionsTestDataVersion> <!-- dotnet-optimization dependencies --> - <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21320.4</optimizationwindows_ntx64MIBCRuntimeVersion> - <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21320.4</optimizationwindows_ntx86MIBCRuntimeVersion> - <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21320.4</optimizationlinuxx64MIBCRuntimeVersion> - <optimizationPGOCoreCLRVersion>1.0.0-prerelease.21320.4</optimizationPGOCoreCLRVersion> + <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationwindows_ntx64MIBCRuntimeVersion> + <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationwindows_ntx86MIBCRuntimeVersion> + <optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21329.4</optimizationlinuxx64MIBCRuntimeVersion> + <optimizationPGOCoreCLRVersion>1.0.0-prerelease.21329.4</optimizationPGOCoreCLRVersion> <!-- Not auto-updated. --> <MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion> <SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion> @@ -149,9 +149,9 @@ <!-- Testing --> <MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion> <MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion> - <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21324.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion> - <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21324.2</MicrosoftDotNetXHarnessCLIVersion> - <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21314.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion> + <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21328.4</MicrosoftDotNetXHarnessTestRunnersXunitVersion> + <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21328.4</MicrosoftDotNetXHarnessCLIVersion> + <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.1-alpha.0.21328.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion> <XUnitVersion>2.4.1</XUnitVersion> <XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion> <CoverletCollectorVersion>1.3.0</CoverletCollectorVersion> @@ -162,23 +162,23 @@ <!-- Docs --> <MicrosoftPrivateIntellisenseVersion>5.0.0-preview-20201009.2</MicrosoftPrivateIntellisenseVersion> <!-- ILLink --> - <MicrosoftNETILLinkTasksVersion>6.0.100-preview.6.21317.4</MicrosoftNETILLinkTasksVersion> + <MicrosoftNETILLinkTasksVersion>6.0.100-preview.6.21330.1</MicrosoftNETILLinkTasksVersion> <MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion> <!-- ICU --> - <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.7.21315.3</MicrosoftNETCoreRuntimeICUTransportVersion> + <MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-preview.7.21328.1</MicrosoftNETCoreRuntimeICUTransportVersion> <!-- MsQuic --> <SystemNetMsQuicTransportVersion>6.0.0-preview.7.21328.2</SystemNetMsQuicTransportVersion> <!-- Mono LLVM --> - <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21314.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> - <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21314.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> - <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21314.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> - <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21314.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> - <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21314.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> - <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21314.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> - <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21314.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> - <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21314.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> + <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21328.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> + <runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21328.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> + <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21328.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> + <runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21328.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> + <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21328.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> + <runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21328.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> + <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21328.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion> + <runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21328.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion> <!-- emscripten / Node --> - <MicrosoftNETRuntimeEmscripten2023Nodewinx64Version>6.0.0-preview.7.21323.1</MicrosoftNETRuntimeEmscripten2023Nodewinx64Version> + <MicrosoftNETRuntimeEmscripten2023Nodewinx64Version>6.0.0-preview.7.21330.1</MicrosoftNETRuntimeEmscripten2023Nodewinx64Version> <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETRuntimeEmscripten2023Nodewinx64Version)</MicrosoftNETRuntimeEmscriptenVersion> </PropertyGroup> </Project> diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aaee1..4b255203249 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } + if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { + $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" + } else { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets index 83d95eae008..517ebf71985 100644 --- a/eng/testing/tests.mobile.targets +++ b/eng/testing/tests.mobile.targets @@ -13,6 +13,8 @@ <PublishTrimmed>true</PublishTrimmed> <!-- Suppress linker warnings as these are tests --> <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> + <!-- https://github.com/dotnet/sdk/issues/18581 tracks needing to set 2 properties to disable warnings. --> + <EnableTrimAnalyzer>false</EnableTrimAnalyzer> <!-- Reduce library test app size by trimming framework library features --> <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(Configuration)' != 'Debug'">false</DebuggerSupport> |