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

Merge 3.1.4xx branches to 5.0.100/master #12424

Merged
merged 1,063 commits into from
Jul 20, 2020
Merged

Merge 3.1.4xx branches to 5.0.100/master #12424

merged 1,063 commits into from
Jul 20, 2020

Conversation

rainersigwald
Copy link
Member

This includes changes from @sfoslund, @MSLukeWest, @AaronRobinsonMSFT, and @drewnoakes that weren't merged into master already. Can y'all please check my conflict resolution?

dotnet-maestro bot and others added 30 commits May 6, 2020 05:57
@dotnet-maestro
Update dependencies from https://github.com/dotnet/fsharp build 20200…
5605fb2 
…505.2 (dotnet#4540)

- Microsoft.FSharp.Compiler: 10.10.0-beta.20254.9 -> 10.10.0-beta.20255.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/NuGet/NuGet.Client build …
211eca6 
…5.7.0.6609 (dotnet#4541)

- NuGet.Build.Tasks: 5.7.0-preview.1.6592 -> 5.7.0-preview.1.6609

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dsplaisted
Fix NullReferenceException in dotnet store
95e89c0
@drewnoakes
Increase minimum required MSBuild to 16.7.0
eb0fb1e 
Changes to the design-time build targets used to populate the dependency node mean that this SDK will only work with VS 16.7 or later.

See dotnet#11358
@dsplaisted
Merge pull request dotnet#11596 from dsplaisted/fix-packages-to-prune…
f3663e3 
…-3.1.4xx

Fix NullReferenceException in dotnet store
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20200511…
10816d2 
….2 (dotnet#4543)

- Microsoft.NET.Sdk: 3.1.400-preview.20252.7 -> 3.1.400-preview.20261.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@drewnoakes
Remove unused property setters
c65e15f
@drewnoakes
Update documentation
4148ba5
@drewnoakes
Simplify lazy initialization
ce14bf9
@drewnoakes
Make methods static
1e77c0a
@drewnoakes
Reduce string allocations
e71eec1 
String.Replace(char, char) allocates a new string even if no replacement is made.
@drewnoakes
Avoid array covariance
6a54585
@drewnoakes
Remove redundant assignments
69d73a1
@drewnoakes
Array cannot be null or have negative item length
046b8e9
@drewnoakes
Inline out var declarations
4b9f980
@drewnoakes
Reduce constructor visibilities
2c9da2b
@drewnoakes
Use local function
b556fab
@drewnoakes
Formatting
4f69a00
@drewnoakes
Remove diagnostics from PreprocessPackageDependenciesDesignTime
23256d3 
These are no longer being consumed by the Dependencies node, which now
sources them directly from the assets file.
@drewnoakes
Documentation
4535ef6
@drewnoakes
Make local functions static
dfcbaf3
@drewnoakes
Convert property to local variable
a3971a1
@drewnoakes
Replace O(N) with O(1) lookup
0343967
@drewnoakes
Reduce allocation when applying item metadata
10fce0c
@drewnoakes
Remove assemblies from PreprocessPackageDependenciesDesignTime
78088a7 
From now on, this task will only return top-level items, so we do not
need to output assemblies, nor do we need to accept FileDefinitions.
@drewnoakes
Remove non-top-level packages from PreprocessPackageDependenciesDesig…
82c9d0e 
…nTime

Performance work on the Dependencies node in dotnet/project-system mean
that only top-level package data is needed from the design-time build.

This commit removes items and metadata related to transitive
dependencies and hierarchy.

- Remove metadata Dependencies, which used to list child IDs
- Remove metadata IsTopLevelDependency, which is now implicitly true
- Remove 'target' items
- Remove object cloning, now that instances are immutable
@drewnoakes
Filter DTB packages by TargetFrameworkMoniker
4632176 
Previously PreprocessPackageDependenciesDesignTime returned package
dependencies for all targets, and PackageRuleHandler in the project
system would filter based on TargetFrameworkMoniker.

This change applies the filtering in this task instead.

As part of this change we are now able to remove the target prefix from
the item spec of output items. This reduces string allocation, improves
the chance of pooling and reduces string manipulation by the consumer.
@drewnoakes
Don't set IsTopLevelDependency metadata
aa3947c 
This metadata always has 'true' as its value. We can infer this in the
project system.
@drewnoakes
Don't set Type metadata
455892a 
This metadata always has 'Package' as its value. We can infer this in
the project system.
@drewnoakes
Require Name for DTB resolved package reference items
b286e4b
dotnet-maestro bot and others added 3 commits July 11, 2020 00:40
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20200710…
5099b65 
….11 (dotnet#13423)

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20358.5 -> To Version 3.1.400-preview.20360.11

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/cli build 20200710…
ea6f5ec 
….1 (dotnet#4680)

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20358.1 -> To Version 3.1.400-preview.20360.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/fsharp build 20200…
d2ebe89 
…711.3 (dotnet#4681)

Microsoft.FSharp.Compiler
 From Version 10.10.0-beta.20329.5 -> To Version 10.10.0-beta.20361.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
dotnet-maestro bot and others added 2 commits July 13, 2020 09:47
@dotnet-maestro
Update dependencies from https://github.com/NuGet/NuGet.Client build …
004ce0c 
…5.7.0.6702 (dotnet#13422)

NuGet.Build.Tasks
 From Version 5.7.0-rtm.6686 -> To Version 5.7.0-rtm.6702

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/cli build 20200713…
1963117 
….1 (dotnet#4682)

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20360.1 -> To Version 3.1.400-preview.20363.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@wli3
Copy link

wli3 commented Jul 13, 2020

2 tests are failing

@sfoslund
Copy link
Member

RunFilesCopiedToPublishDirTest
Expected collection to contain a single item matching i.RelativePath.Equals(Format("{0}{1}", value(Microsoft.NET.Publish.Tests.FilesCopiedToPublishDirTests+<>c__DisplayClass2_1).CS$<>8__locals1.testProject.Name, value(Microsoft.NET.Publish.Tests.FilesCopiedToPublishDirTests+<>c__DisplayClass2_1).exeSuffix), OrdinalIgnoreCase), but the collection is empty.

GroupBuildsWithoutPublish
Expected directory "F:\workspace_work\1\s\artifacts\tmp\Release\GroupBuildsWi---EFE7EAA9\TestPublishOutputGroup\bin\Debug\netcoreapp3.0\win-x86\publish" not to exist.

@MSLukeWest it looks like you wrote these tests, any idea why they're failing?

@MSLukeWest
Copy link
Contributor

RunFilesCopiedToPublishDirTest
Expected collection to contain a single item matching i.RelativePath.Equals(Format("{0}{1}", value(Microsoft.NET.Publish.Tests.FilesCopiedToPublishDirTests+<>c__DisplayClass2_1).CS$<>8__locals1.testProject.Name, value(Microsoft.NET.Publish.Tests.FilesCopiedToPublishDirTests+<>c__DisplayClass2_1).exeSuffix), OrdinalIgnoreCase), but the collection is empty.

GroupBuildsWithoutPublish
Expected directory "F:\workspace_work\1\s\artifacts\tmp\Release\GroupBuildsWi---EFE7EAA9\TestPublishOutputGroup\bin\Debug\netcoreapp3.0\win-x86\publish" not to exist.

@MSLukeWest it looks like you wrote these tests, any idea why they're failing?

I checked in an update to fix the tests, let me know if they still fail

dotnet-maestro bot and others added 5 commits July 14, 2020 02:11
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20200…
0c810c9 
…714.1 (dotnet#4683)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-3.20312.3 -> To Version 3.7.0-4.20364.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/dotnet/roslyn build 20200…
e2a91b6 
…715.2 (dotnet#4686)

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-4.20364.1 -> To Version 3.7.0-5.20365.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@wtgodbe
Insert 3.1.6 runtime (dotnet#4685)
d8ac267
@wtgodbe
Insert 3.1.6 runtime (dotnet#13428)
db1e18b
@dotnet-maestro @wtgodbe
[release/3.1.4xx] Update dependencies from dotnet/cli (dotnet#4687)
d6add9e 
* Update dependencies from https://github.com/dotnet/cli build 20200715.4

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20363.1 -> To Version 3.1.400-preview.20365.4

* Remove int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Will Godbe <wigodbe@microsoft.com>
@sfoslund
Copy link
Member

@rainersigwald is this good to go in?

dotnet-maestro bot and others added 10 commits July 17, 2020 07:26
@dotnet-maestro
[release/3.1.4xx] Update dependencies from dotnet/sdk (dotnet#4691)
dfaa012 
* Update dependencies from https://github.com/dotnet/sdk build 20200715.20

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20360.11 -> To Version 3.1.400-preview.20365.20

* remove darc int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>
@dotnet-maestro
[release/3.1.4xx] Update dependencies from dotnet/arcade (dotnet#4689)
5e9fcfd 
* Update dependencies from https://github.com/dotnet/arcade build 20200715.6

Microsoft.DotNet.Arcade.Sdk
 From Version 1.0.0-beta.20326.2 -> To Version 1.0.0-beta.20365.6

* Remove darc int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>
@dotnet-maestro
[release/3.1.4xx] Update dependencies from dotnet/roslyn (dotnet#4688)
87363be 
* Update dependencies from https://github.com/dotnet/roslyn build 20200716.1

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20366.1

* Update dependencies from https://github.com/dotnet/roslyn build 20200716.7

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20366.7

* Update dependencies from https://github.com/dotnet/roslyn build 20200717.1

Microsoft.Net.Compilers.Toolset
 From Version 3.7.0-5.20365.2 -> To Version 3.7.0-5.20367.1

* Remove darc int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>
@dotnet-maestro
[release/3.1.4xx] Update dependencies from dotnet/arcade (dotnet#13435)
409cc2a 
* Update dependencies from https://github.com/dotnet/arcade build 20200715.6

Microsoft.DotNet.Arcade.Sdk
 From Version 1.0.0-beta.20326.2 -> To Version 1.0.0-beta.20365.6

* Update stage 0

* Remove darc int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>
@dotnet-maestro
[release/3.1.4xx] Update dependencies from dotnet/sdk (dotnet#13437)
1c31b91 
* Update dependencies from https://github.com/dotnet/sdk build 20200715.20

Microsoft.NET.Sdk
 From Version 3.1.400-preview.20360.11 -> To Version 3.1.400-preview.20365.20

* Update stage 0

* Remove darc int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>
@dotnet-maestro
[release/3.1.4xx] Update dependencies from dotnet/cli (dotnet#4693)
01eb9ad 
* Update dependencies from https://github.com/dotnet/cli build 20200717.1

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20365.4 -> To Version 3.1.400-preview.20367.1

* Update dependencies from https://github.com/dotnet/cli build 20200717.2

Microsoft.DotNet.Cli.Runtime
 From Version 3.1.400-preview.20365.4 -> To Version 3.1.400-preview.20367.2

* Remove darc int feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <AzureTest@vwuzhai002.redmond.corp.microsoft.com>
@rainersigwald
Merge remote-tracking branch 'upstream/master' into merge-3.1
8c7dca4 
 Conflicts:
	eng/Version.Details.xml
	eng/Versions.props
@rainersigwald
Merge remote-tracking branch 'toolset/release/3.1.4xx' into merge-3.1
c1bc777
@rainersigwald
Merge remote-tracking branch 'old-cli/release/3.1.4xx' into merge-3.1
8493de3 
 Conflicts:
	NuGet.config
	eng/Version.Details.xml
	eng/Versions.props
	eng/common/templates/post-build/post-build.yml
	global.json
@rainersigwald
Merge branch 'merge-3.1' of https://github.com/rainersigwald/sdk into…
1a8a8a3 
… merge-3.1
@rainersigwald
Copy link
Member Author

Should be good to go now after conflict resolution. Looks like a Roslyn update snuck into 3.1 that hadn't gotten to master yet, so I went ahead and took it.

@rainersigwald rainersigwald merged commit 2e12384 into dotnet:master Jul 20, 2020
@rainersigwald rainersigwald deleted the merge-3.1 branch July 20, 2020 19:26
@PathogenDavid PathogenDavid mentioned this pull request Jul 22, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MSLukeWest MSLukeWest MSLukeWest approved these changes

@AaronRobinsonMSFT AaronRobinsonMSFT AaronRobinsonMSFT approved these changes

@sfoslund sfoslund sfoslund approved these changes

@drewnoakes drewnoakes drewnoakes 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.