Skip to content

[main] Fix MonoToolchain.Current naming and Update dependencies from dotnet/emsdk and dotnet/sdk #15366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jan 31, 2023
Merged

[main] Fix MonoToolchain.Current naming and Update dependencies from dotnet/emsdk and dotnet/sdk #15366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ba67249
Update dependencies from https://github.com/dotnet/sdk build 20230127.5
dotnet-maestro[bot] Jan 27, 2023
5a91622
Update dependencies from https://github.com/dotnet/sdk build 20230127.7
dotnet-maestro[bot] Jan 27, 2023
1c3e731
Add Current manifests entries for wasm/mono
lewing Jan 27, 2023
ba33343
Remove the Current reference from ToolChain to test enable flow
lewing Jan 27, 2023
e76ec92
yolo
lewing Jan 28, 2023
533c92f
Update dependencies from https://github.com/dotnet/sdk build 20230127.9
dotnet-maestro[bot] Jan 28, 2023
1f751e1
Update dependencies from https://github.com/dotnet/sdk build 20230128.2
dotnet-maestro[bot] Jan 28, 2023
156d55c
Update dependencies from https://github.com/dotnet/sdk build 20230128.3
dotnet-maestro[bot] Jan 29, 2023
2e8e614
Update dependencies from https://github.com/dotnet/sdk build 20230129.1
dotnet-maestro[bot] Jan 29, 2023
09e3035
Update dependencies from https://github.com/dotnet/sdk build 20230129.2
dotnet-maestro[bot] Jan 29, 2023
12edbda
Merge branch 'main' into darc-main-161dff7d-55bc-4da9-85ae-8b19c5e882ad
lewing Jan 29, 2023
f35e7ac
Merge remote-tracking branch 'origin/darc-main-161dff7d-55bc-4da9-85a…
lewing Jan 29, 2023
c09c69f
Update to new runtime manifests
lewing Jan 29, 2023
09703e2
Fix bad manual editing
lewing Jan 29, 2023
6f19067
Update the emscripten dep
lewing Jan 29, 2023
6207b61
Bump the CoreSdkTargetFramework
lewing Jan 30, 2023
7427587
Update global.json
marcpopMSFT Jan 30, 2023
696b166
[TEST} Test looks up Release folder if 8.0 or higher
nagilson Jan 30, 2023
a9d901b
Make a test use Release instead of Debug because dotent publish uses …
nagilson Jan 30, 2023
54a6d72
Exclude *Current
lewing Jan 31, 2023
b4917a7
Merge branch 'main' into lewing/current-manifest-names
lewing Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<DebugSymbols>true</DebugSymbols>

<IsShipping>true</IsShipping>
<CoreSdkTargetFramework>net7.0</CoreSdkTargetFramework>
<CoreSdkTargetFramework>net8.0</CoreSdkTargetFramework>

<!-- MSB3243 and MSB3247 fire when attempting to resolve references to the same assembly from different cultures.
This is a prevalent problem in building the precomputed assembly reference cache. Limiting the assemblies resolved
Expand Down
124 changes: 70 additions & 54 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.23076.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>730ffef0efec485925f717a411f690c77f54831a</Sha>
<Sha>6143c2f1778128370974f543fbeca8c208c80c5c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.23076.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>730ffef0efec485925f717a411f690c77f54831a</Sha>
<Sha>6143c2f1778128370974f543fbeca8c208c80c5c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.23076.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>730ffef0efec485925f717a411f690c77f54831a</Sha>
<Sha>6143c2f1778128370974f543fbeca8c208c80c5c</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.23076.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>730ffef0efec485925f717a411f690c77f54831a</Sha>
<Sha>6143c2f1778128370974f543fbeca8c208c80c5c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.23076.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>007df054a526ed9e3dc70b43bfa330943bd4816a</Sha>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23076.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>007df054a526ed9e3dc70b43bfa330943bd4816a</Sha>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.23076.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>007df054a526ed9e3dc70b43bfa330943bd4816a</Sha>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.23076.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>007df054a526ed9e3dc70b43bfa330943bd4816a</Sha>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.23076.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>007df054a526ed9e3dc70b43bfa330943bd4816a</Sha>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.23076.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>007df054a526ed9e3dc70b43bfa330943bd4816a</Sha>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.23076.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>007df054a526ed9e3dc70b43bfa330943bd4816a</Sha>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.23076.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4d75ee9a7fbad112e29b8a1d77c7d96965f62b40</Sha>
<Sha>15d5f0c640dad0d4f89f9a42e7fce6724a2ee390</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-alpha.1.23076.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4d75ee9a7fbad112e29b8a1d77c7d96965f62b40</Sha>
<Sha>15d5f0c640dad0d4f89f9a42e7fce6724a2ee390</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.23076.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4d75ee9a7fbad112e29b8a1d77c7d96965f62b40</Sha>
<Sha>15d5f0c640dad0d4f89f9a42e7fce6724a2ee390</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.23076.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4d75ee9a7fbad112e29b8a1d77c7d96965f62b40</Sha>
<Sha>15d5f0c640dad0d4f89f9a42e7fce6724a2ee390</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="8.0.0-alpha.1.23076.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4d75ee9a7fbad112e29b8a1d77c7d96965f62b40</Sha>
<Sha>15d5f0c640dad0d4f89f9a42e7fce6724a2ee390</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="8.0.0-alpha.1.23076.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4d75ee9a7fbad112e29b8a1d77c7d96965f62b40</Sha>
<Sha>15d5f0c640dad0d4f89f9a42e7fce6724a2ee390</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="8.0.0-alpha.1.23076.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="8.0.0-alpha.1.23078.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4d75ee9a7fbad112e29b8a1d77c7d96965f62b40</Sha>
<Sha>15d5f0c640dad0d4f89f9a42e7fce6724a2ee390</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand All @@ -102,31 +102,31 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>bb3695688177f5f80eeb3c0498168612e31549d5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-alpha.1.23077.4">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-alpha.1.23079.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>33d4e69b44b347a437294656b9af947fe9597fd7</Sha>
<Sha>3bf26ad421d4a4a748647d7ec94a4f408db06869</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-alpha.1.23077.4">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-alpha.1.23079.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>33d4e69b44b347a437294656b9af947fe9597fd7</Sha>
<Sha>3bf26ad421d4a4a748647d7ec94a4f408db06869</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-alpha.1.23077.4">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-alpha.1.23079.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>33d4e69b44b347a437294656b9af947fe9597fd7</Sha>
<Sha>3bf26ad421d4a4a748647d7ec94a4f408db06869</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-alpha.1.23077.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-alpha.1.23079.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>33d4e69b44b347a437294656b9af947fe9597fd7</Sha>
<Sha>3bf26ad421d4a4a748647d7ec94a4f408db06869</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-alpha.1.23075.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-alpha.1.23077.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>3d45c8f711add6fc649a9a352d4b69205c446485</Sha>
<Sha>77d01dd234bc6fb2dac3b86d6c2a0b7cd61f1507</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-alpha.1.23076.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.0-alpha.1.23077.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>0d2289f1b6fb0731a36c9ecc7b5e57ccb9e00e69</Sha>
<Sha>be76f4d64b07011f16c14db5e85c7735778819e4</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23069.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
Expand All @@ -153,9 +153,9 @@
<Sha>5ca760eb6aab71e70810c595a440429914698765</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.6.0-preview-23076-08" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.6.0-preview-23077-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>d9c24230c20a65c57a5a60f396d6d28336a64c74</Sha>
<Sha>5f95887e07c8173b1c24c26c791e3ade924a4e8d</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.5.0-rc.149" CoherentParentDependency="Microsoft.NET.Sdk">
Expand All @@ -167,13 +167,29 @@
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>
<Sha>53b80940842204f78708a538628288ff5d741a1d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100" Version="8.0.0-alpha.1.23073.2">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23077.4">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ff2362091c3ce19e09606a7de927670ba5d1cb81</Sha>
<Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.23073.2">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23077.4">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>ff2362091c3ce19e09606a7de927670ba5d1cb81</Sha>
<Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23077.4">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23078.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dfe1076090adad6990747e6abed8bf6699371877</Sha>
</Dependency>
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview5.1.22263.1">
<Uri>https://github.com/dotnet/deployment-tools</Uri>
Expand Down
Loading