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

Branding main to 7.0.0 alpha1 #1961

Merged
merged 18 commits into from
Aug 19, 2021
Merged

Branding main to 7.0.0 alpha1 #1961

merged 18 commits into from
Aug 19, 2021

Conversation

dreddy-work
Copy link
Member

No description provided.

dotnet-maestro bot and others added 3 commits August 18, 2021 00:51
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210817.13
053c793 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 6.0.0-rc.1.21417.13
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210817.14
76de17e 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 6.0.0-rc.1.21417.14

Dependency coherency updates

Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.3 -> To Version 6.0.0-rc.1.21417.4 (parent: Microsoft.DotNet.Wpf.GitHub
@dreddy-work
Branding main to 7.0.0 alpha1
d89e8f2
dreddy-work
dreddy-work commented Aug 18, 2021
View reviewed changes
eng/Versions.props
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MajorVersion>6</MajorVersion>
<MajorVersion>7</MajorVersion>
Copy link
Member Author

@dreddy-work dreddy-work Aug 18, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ryalanms , looks like we are reusing this variable for fetching package here: pkg/windowsdesktop/bundle/Microsoft.WindowsDesktop.App.Bundle.bundleproj. which , for me, seems not right and causing build failure because package doesn't yet exist. Can you take a look please? @RussKie FYI.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mmitche , Branding on Desktop repo is going to be blocked until we have a package VS.Redist.Common.NetCore.%(InsertionName).%(Arch).$(MajorVersion).$(MinorVersion) published.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would retry tomorrow after more repos have had successful builds.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the most recent version that was produced by the runtime:

<Package Id="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21417.28" NonShipping="true"/>

This is the error building locally:

D:\windowsdesktop\pkg\windowsdesktop\bundle\Microsoft.WindowsDesktop.App.Bundle.bundleproj : error NU1101: Unable to find package VS.Redist.Common.NetCore.SharedFramework.x64.7.0. No packages exist with this id in source(s): dotnet-eng, dotnet-public, dotnet-tools, dotnet5, dotnet5-transport, dotnet6, dotnet6-transport [D:\windowsdesktop.dotnet\sdk\6.0.100-rc.1.21379.2\NuGet.targets]

With these additional feeds in nuget.config:

  <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
    <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />

D:\windowsdesktop\pkg\windowsdesktop\bundle\Microsoft.WindowsDesktop.App.Bundle.bundleproj : error NU1102: Unable to find package VS.Redist.Common.NetCore.SharedFramework.x64.7.0 with version (= 6.0.0-rc.1.21417.1) [D:\windowsdesktop.dotnet\sdk\6.0.100-rc.1.21379.2\NuGet.targets]
D:\windowsdesktop\pkg\windowsdesktop\bundle\Microsoft.WindowsDesktop.App.Bundle.bundleproj : error NU1102: - Found 1 version(s) in dotnet7-transport [ Nearest version: 7.0.0-alpha.1.21417.28 ] [D:\windowsdesktop.dotnet\sdk\6.0.100-rc.1.21379.2\NuGet.targets]

I think WindowsDesktop needs the new feeds and the version in versions.props needs to be updated.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. This needs to flow through wpf and winforms first.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.1
f72fad7 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 6.0.0-rc.1.21418.1

Dependency coherency updates

Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.3 -> To Version 6.0.0-rc.1.21417.4 (parent: Microsoft.DotNet.Wpf.GitHub
@dreddy-work
Copy link
Member Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.7
ace01e5 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21418.7

Dependency coherency updates

Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.3 -> To Version 6.0.0-rc.1.21417.4 (parent: Microsoft.DotNet.Wpf.GitHub
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.11
9ca1319 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21418.11

Dependency coherency updates

Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Private.Winforms,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.3 -> To Version 7.0.0-alpha.1.21417.10 (parent: Microsoft.DotNet.Wpf.GitHub
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.15
ed33da3 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21418.15

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.1 -> To Version 7.0.0-alpha.1.21418.2 (parent: Microsoft.Private.Winforms
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.16
822bd1c 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21418.16

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.1 -> To Version 7.0.0-alpha.1.21418.2 (parent: Microsoft.Private.Winforms
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.19
a72cbf1 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21418.19

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.1 -> To Version 7.0.0-alpha.1.21418.2 (parent: Microsoft.Private.Winforms
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.20
0340072 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21418.20

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.1 -> To Version 7.0.0-alpha.1.21418.2 (parent: Microsoft.Private.Winforms
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210818.21
2ba9ed7 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21418.21

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.1 -> To Version 7.0.0-alpha.1.21418.2 (parent: Microsoft.Private.Winforms
@ViktorHofer
Copy link
Member

You probably also need to add the dotnet7 and dotnet7-transport feed to the NuGet.config.

ViktorHofer and others added 5 commits August 19, 2021 10:59
@ViktorHofer
Add dotnet7 feeds
00ee8ce
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210819.1
710aa07 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21419.1

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.1 -> To Version 7.0.0-alpha.1.21418.2 (parent: Microsoft.Private.Winforms
@dotnet-maestro
Update dependencies from https://github.com/dotnet/wpf build 20210819.2
e1a69c5 
Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop
 From Version 6.0.0-rc.1.21417.12 -> To Version 7.0.0-alpha.1.21419.2

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates
 From Version 6.0.0-rc.1.21417.1 -> To Version 7.0.0-alpha.1.21419.1 (parent: Microsoft.Private.Winforms
@mmitche
Fix feeds
b166773
@mmitche
Update package names a
a19e099
@mmitche
Copy link
Member

mmitche commented Aug 19, 2021

I am going to combine this with the dependency update commit. I think it's required based on how this repo tries to look for the runtime packages.

@mmitche mmitche merged commit 330c5a7 into main Aug 19, 2021
@mmitche mmitche deleted the dev/dreddy/branding70 branch August 19, 2021 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmitche mmitche mmitche left review comments

@ryalanms ryalanms ryalanms approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@dreddy-work @ViktorHofer @mmitche @ryalanms