Merge branch 'release/7.0.2xx' => 'main' #29158

v-wuzhai · 2022-11-22T06:21:33Z

No description provided.

…013.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22513.4

…014.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22514.3

…031.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22531.4

…107.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22557.1

…f the restore to be included in deps.json

…108.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22511.2 -> To Version 7.0.0-beta.22558.4

…ationProjectOutputGroup

…1114.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22561-03 -> To Version 17.5.0-preview-22564-01

…113.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22561.2 -> To Version 7.0.1-beta.22563.3

…7b7-4504-81ff-8164ad62a4a8 [release/7.0.2xx] Update dependencies from dotnet/msbuild

…eed-4bbb-8075-40511483848d [release/7.0.2xx] Update dependencies from dotnet/fsharp

Include ijwhost in DesignerRuntimeImplementationProjectOutputGroupOutput

This broke with changes related to #27199. It's now possible to have multiple supported platform version items for the same version.

Depending on whether we're using preview versions, some of the packages may be downloaded by NuGet and have lowercased names, while at other times they may be shipped in the packs folder and have mixed case.

…orm-version Fix TargetPlatformVersion normalization for Windows

…111.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.22558.4 -> To Version 7.0.0-beta.22561.2

GangWang01 · 2022-11-23T10:15:51Z

PR dotnet/templating#5223 is not ported to templating release/7.0.2xx. It causes different behaviors when dealing with disabled parameters as we recently found.

We need to change the approvals for the following tests when merging into main branch.

        [Theory]
        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA", "A")]
        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB", "AB")]
        //[InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB|--A_enabled", "AB")]
        public Task CannotInstantiateTemplate_WithDisabledParams(string parameters, string setName)

Approvals:

// value of paramA: placeholderA
// value of paramB: placeholderB

@vlada-shubina do we need to port PR dotnet/templating#5223 to templating release/7.0.2xx and adjust the test to resolve this problem, or just adjust the test for SDK main branch?

vlada-shubina · 2022-11-23T11:03:52Z

PR dotnet/templating#5223 is not ported to templating release/7.0.2xx. It causes different behaviors when dealing with disabled parameters as we recently found.

We need to change the approvals for the following tests when merging into main branch.
        [Theory]
        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA", "A")]
        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB", "AB")]
        //[InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB|--A_enabled", "AB")]
        public Task CannotInstantiateTemplate_WithDisabledParams(string parameters, string setName)
Approvals:
// value of paramA: placeholderA
// value of paramB: placeholderB
@vlada-shubina do we need to port PR dotnet/templating#5223 to templating release/7.0.2xx and adjust the test to resolve this problem, or just adjust the test for SDK main branch?

dotnet/templating#5223 won't be ported to release/7.0.2xx, therefore please adjust the test.

…rge702tomain

v-wuzhai · 2022-11-24T09:17:30Z

@marcpopMSFT @dsplaisted It seems that some of the newly enabled test runs are failed in main.

… main and release/7.0.2xx

vlada-shubina · 2022-11-24T12:42:07Z

@v-wuzhai I merged the fix prepared by @GangWang01. There were tests failures in his PR but I don't think they are related to fix, also same failures were observed in this PR. Please let me know if you need any other assistance from templating team.

nagilson · 2022-11-28T17:24:21Z

No, those failures seem related to something Marc was working on fixing.

marcpopMSFT · 2022-11-28T18:23:03Z

Actually, I enabled all the cppcli tests. However, because cppcli doesn't support implicit versions, it has to target the same runtime as the SDK used in the tests. So in 7.0 these tests worked but they had to be updated to target 8.0 with this flow to main. I made the changes I think are needed. Let's see if the tests pass.

v-wuzhai · 2022-11-29T05:43:53Z

/azp run

azure-pipelines · 2022-11-29T05:44:04Z

Azure Pipelines successfully started running 1 pipeline(s).

v-wuzhai · 2022-11-29T09:42:26Z

##[error]Unhandled: ENOSPC: no space left on device, open 'D:\a_temp.taskkey'

@marcpopMSFT There seems to be no real error. Could we force to merge?

marcpopMSFT · 2022-11-30T21:25:33Z

I believe @joeloff already fixed this in a different PR. I'll rerun to force a remerge.

marcpopMSFT · 2022-11-30T21:25:39Z

/azp run

azure-pipelines · 2022-11-30T21:25:51Z

Azure Pipelines successfully started running 1 pipeline(s).

…t work for NextTargetFramework

… they require an override for the targeting pack and app host

marcpopMSFT · 2022-12-02T00:33:36Z

Disabled the four tests that were failing in the last run. @dsplaisted it doesn't look like I can make the cppcli tests work in main because the SDK expects one set of apphost/targeting packs from it's stage 0 version but a different verison of the runtime is installed. I could try overwriting the RuntimeFrameworkVersion but that doesn't affect the targeting packs. I could maybe add in an override for the targeting packs as well but it would be more involved as we don't have a simple way of overriding that.

dsplaisted · 2022-12-02T16:19:21Z

@marcpopMSFT Are the projects for those tests using NuGet PackageReference support? I believe that in that case it shouldn't matter whether the installed versions match exactly because it should download what it needs during restore. We've probably never validated that since PackageReference support was added though, so there might be something we need to update to make it work.

marcpopMSFT · 2022-12-02T18:31:44Z

@dsplaisted good idea. I'll have to add an extra package reference to the project as the support doesn't work without it but that appears to unblock the tests. I'll do that as a separate PR and I'll also file an issue that cppcli package reference support should enable implicit apphost download without requiring an additional reference.

dotnet-maestro bot and others added 30 commits October 14, 2022 12:00

Update Microsoft.NET.Windows.targets

eb9d880

Initial change to try to get project references that are not a part o…

457feac

…f the restore to be included in deps.json

PR feedback

19e3a8f

PR comment fixes, fix to problematic update

71d5b2c

fix test again

98714fa

Add new option for json output of dotnet list package

87d7762

Include ijwhost in DesignerRuntimeImplementationProjectOutputGroupOutput

fef3957

Projects referencing C++/CLI need ijwhost in DesignerRuntimeImplement…

aeba920

…ationProjectOutputGroup

Add a property that controls whether to use the new behavior or not

e46be67

Update dependencies from https://github.com/dotnet/msbuild build 2022…

436940c

…1114.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.5.0-preview-22561-03 -> To Version 17.5.0-preview-22564-01

Update dependencies from https://github.com/dotnet/fsharp build 20221…

b2c32f1

…113.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.1-beta.22561.2 -> To Version 7.0.1-beta.22563.3

Merge pull request #29050 from dotnet/darc-release/7.0.2xx-a850e377-1…

0c96321

…7b7-4504-81ff-8164ad62a4a8 [release/7.0.2xx] Update dependencies from dotnet/msbuild

Merge pull request #29051 from dotnet/darc-release/7.0.2xx-b8983e72-e…

d85153e

…eed-4bbb-8075-40511483848d [release/7.0.2xx] Update dependencies from dotnet/fsharp

Merge pull request #28929 from elinor-fung/ijwhost-designer-output

b1e1cfb

Include ijwhost in DesignerRuntimeImplementationProjectOutputGroupOutput

Fix normalization of TargetPlatformVersion for Windows

32c598b

This broke with changes related to #27199. It's now possible to have multiple supported platform version items for the same version.

Fix duplicate compilation constants

edea59c

Fix Blazor baselines to account for 6.0.11

9490405

Make analyzer test package name comparison case insensitive

91b88f3

Depending on whether we're using preview versions, some of the packages may be downloaded by NuGet and have lowercased names, while at other times they may be shipped in the packs folder and have mixed case.

PR feedback - move default property setting to Microsoft.NET.Sdk.targets

8130e1c

Add error when specifying --output option for a solution

fb98b97

Merge pull request #29009 from dsplaisted/fix-normalize-windows-platf…

22c1f98

…orm-version Fix TargetPlatformVersion normalization for Windows

fixed error reporting

3f9beb1

Update tests for new property passed for --output parameter

32a7b0e

Fix tests using same test path

69afb94

vlada-shubina added the Area-dotnet new the item is related to dotnet new command label Nov 22, 2022

GangWang01 mentioned this pull request Nov 24, 2022

Adjust test due to different behaviors for disabled parameter between main and release/7.0.2xx #29209

Merged

Merge branch 'main' of https://github.com/dotnet/sdk into v-wuzhai/Me…

942e12c

…rge702tomain

v-wuzhai force-pushed the v-wuzhai/Merge702tomain branch 2 times, most recently from 7cc1502 to 942e12c Compare November 24, 2022 07:34

Adjust test due to different behaviors for disabled parameter between…

2d2f5f1

… main and release/7.0.2xx

vlada-shubina removed the Area-dotnet new the item is related to dotnet new command label Nov 24, 2022

Update cppcli tests in main to target 8.0

2d0b348

v-wuzhai mentioned this pull request Dec 1, 2022

Update target framework version in toolsetinfo for NET 8. #29316

Merged

marcpopMSFT added 2 commits December 1, 2022 13:57

Hardcode the cppcli tests to 8.0 for now as our TF overloading doesn'…

7ae0469

…t work for NextTargetFramework

4 of the cppcli tests still can't work even with the other changes as…

8952266

… they require an override for the targeting pack and app host

v-wuzhai requested a review from marcpopMSFT December 2, 2022 08:21

marcpopMSFT approved these changes Dec 2, 2022

View reviewed changes

marcpopMSFT merged commit 3a12a4c into main Dec 2, 2022

marcpopMSFT deleted the v-wuzhai/Merge702tomain branch December 2, 2022 18:31

Merge branch 'release/7.0.2xx' => 'main' #29158

Merge branch 'release/7.0.2xx' => 'main' #29158

Uh oh!

Conversation

v-wuzhai commented Nov 22, 2022

Uh oh!

GangWang01 commented Nov 23, 2022

Uh oh!

vlada-shubina commented Nov 23, 2022

Uh oh!

v-wuzhai commented Nov 24, 2022

Uh oh!

vlada-shubina commented Nov 24, 2022

Uh oh!

nagilson commented Nov 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marcpopMSFT commented Nov 28, 2022

Uh oh!

v-wuzhai commented Nov 29, 2022

Uh oh!

azure-pipelines bot commented Nov 29, 2022

Uh oh!

v-wuzhai commented Nov 29, 2022

Uh oh!

marcpopMSFT commented Nov 30, 2022

Uh oh!

marcpopMSFT commented Nov 30, 2022

Uh oh!

azure-pipelines bot commented Nov 30, 2022

Uh oh!

marcpopMSFT commented Dec 2, 2022

Uh oh!

dsplaisted commented Dec 2, 2022

Uh oh!

marcpopMSFT commented Dec 2, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

nagilson commented Nov 28, 2022 •

edited

Loading