Skip to content
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

Jump to bottom

[release/8.0.1xx-preview1] Merge runtime workloads #15376

Merged
merged 20 commits into from
Jan 31, 2023
Merged

[release/8.0.1xx-preview1] Merge runtime workloads #15376

merged 20 commits into from
Jan 31, 2023

Conversation

lewing
Copy link
Member

@lewing lewing commented Jan 31, 2023

  • Please add description for changes you are making.
  • If there is an issue related to this PR, please add the reference.

dotnet-maestro bot and others added 18 commits January 27, 2023 21:25
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230127.5
ba67249 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23077.4 -> To Version 8.0.100-alpha.1.23077.5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230127.7
5a91622 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23077.4 -> To Version 8.0.100-alpha.1.23077.7
@lewing
Add Current manifests entries for wasm/mono
1c3e731
@lewing
Remove the Current reference from ToolChain to test enable flow
ba33343
@lewing
yolo
e76ec92
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230127.9
533c92f 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23077.4 -> To Version 8.0.100-alpha.1.23077.9

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 8.0.0-alpha.1.23076.9 -> To Version 8.0.0-alpha.1.23077.4 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230128.2
1f751e1 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23077.4 -> To Version 8.0.100-alpha.1.23078.2

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 8.0.0-alpha.1.23076.9 -> To Version 8.0.0-alpha.1.23077.5 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230128.3
156d55c 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23077.4 -> To Version 8.0.100-alpha.1.23078.3

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 8.0.0-alpha.1.23076.9 -> To Version 8.0.0-alpha.1.23078.4 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230129.1
2e8e614 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23077.4 -> To Version 8.0.100-alpha.1.23079.1

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 8.0.0-alpha.1.23076.3 -> To Version 8.0.0-alpha.1.23078.1 (parent: Microsoft.NET.Sdk
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20230129.2
09e3035 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.23077.4 -> To Version 8.0.100-alpha.1.23079.2

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 8.0.0-alpha.1.23076.3 -> To Version 8.0.0-alpha.1.23078.1 (parent: Microsoft.NET.Sdk
@lewing
Merge branch 'main' into darc-main-161dff7d-55bc-4da9-85ae-8b19c5e882ad
12edbda
@lewing
Merge remote-tracking branch 'origin/darc-main-161dff7d-55bc-4da9-85a…
f35e7ac 
…e-8b19c5e882ad' into lewing/current-manifest-names
@lewing
Update to new runtime manifests
c09c69f
@lewing
Fix bad manual editing
09703e2
@lewing
Update the emscripten dep
6f19067
@lewing
Bump the CoreSdkTargetFramework
6207b61
@lewing @dotnet-maestro
@marcpopMSFT @nagilson
[main] Fix MonoToolchain.Current naming and Update dependencies from …
6caeedd 
…dotnet/emsdk and dotnet/sdk (#15366)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marc Paine <[email protected]>
Co-authored-by: Noah Gilson <[email protected]>
@lewing
Merge branch 'lewing/current-manifest-names' into release/8.0.1xx-pre…
9542e5c 
…view1
@lewing
Copy link
Member Author

lewing commented Jan 31, 2023

is there a separate package feed for preview1?

@joeloff
Copy link
Member

joeloff commented Jan 31, 2023 •
edited
Loading

is there a separate package feed for preview1?

I don't think so. Everything should be using dotnet8 and dotnet8-transport feeds. I only see preview 1 versions of the preview 1 manifest packages in the feeds

image

The versions.props file though have the version as alpha.1, so I'm guessing the package the build is looking for doesn't actually exist.

image

@v-wuzhai v-wuzhai mentioned this pull request Jan 31, 2023
Merged
@lewing
Copy link
Member Author

lewing commented Jan 31, 2023

Yeah the issue was the one I called out in the original pr.

@lewing lewing enabled auto-merge January 31, 2023 17:28
@lewing
Copy link
Member Author

lewing commented Jan 31, 2023

there will need to be a follow up to pick up the preview.1 branded packs, but one step at a time

@lewing lewing merged commit 64d0097 into release/8.0.1xx-preview1 Jan 31, 2023
@lewing lewing deleted the lewing/merge-workloads-preview1 branch January 31, 2023 17:41
@MichaelSimons
Copy link
Member

@lewing - I suspect this may have introduced a regression - All PR validation jobs appear to be failing.

e.g. #15372

src/redist/redist.csproj(0,0): error NU1102: (NETCORE_ENGINEERING_TELEMETRY=Restore) Unable to find package Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100-preview.2 with version (= 8.0.0-alpha.1.23077.4)

@lewing
Copy link
Member Author

lewing commented Jan 31, 2023 •
edited
Loading

@lewing - I suspect this may have introduced a regression - All PR validation jobs appear to be failing.

e.g. #15372

src/redist/redist.csproj(0,0): error NU1102: (NETCORE_ENGINEERING_TELEMETRY=Restore) Unable to find package Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100-preview.2 with version (= 8.0.0-alpha.1.23077.4)

@MichaelSimons the branding change in main triggered that, should be fixed by #15380

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joeloff joeloff joeloff approved these changes

@marcpopMSFT marcpopMSFT Awaiting requested review from marcpopMSFT

@steveisok steveisok Awaiting requested review from steveisok

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lewing @joeloff @MichaelSimons