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.

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

Added net7 support. #3944

Merged
merged 24 commits into from
Aug 25, 2022
Merged

Added net7 support. #3944

merged 24 commits into from
Aug 25, 2022

Conversation

Haplois
Copy link
Contributor

@Haplois Haplois commented Aug 16, 2022

No description provided.

playground/MSTest1/MSTest1.csproj Show resolved Hide resolved
shared/NullableAttributes.cs Show resolved Hide resolved
playground/MSTest1/MSTest1.csproj Show resolved Hide resolved
src/SettingsMigrator/Migrator.cs Outdated Show resolved Hide resolved
src/SettingsMigrator/Migrator.cs Show resolved Hide resolved
src/SettingsMigrator/Migrator.cs Outdated Show resolved Hide resolved
Haplois and others added 13 commits August 22, 2022 12:45
…nAttachmentManager.cs

Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
- Rework nullability
- Fix typos
- Remove unused directives
- Add pragma for directive used only under certain conditions
@Haplois Haplois enabled auto-merge (squash) August 22, 2022 13:14
Copy link
Member

@Evangelink Evangelink left a comment

Choose a reason for hiding this comment

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

Let's wait for tomorrow's discussion on netstandard before merging this one. There will be conflicts between the 2 PRs and netstandard is older so it would be better to fix conflicts here. If we decide to make more work on netstandard PR then we will merge this one first.

@Evangelink Evangelink enabled auto-merge (squash) August 22, 2022 17:18
@Evangelink
Copy link
Member

@Haplois Ping me for a new review when conflicts are fixed.

@Evangelink Evangelink enabled auto-merge (squash) August 24, 2022 19:49
lbussell added a commit to MichaelSimons/installer that referenced this pull request Aug 24, 2022
@Haplois Haplois disabled auto-merge August 25, 2022 07:00
@Haplois Haplois enabled auto-merge (squash) August 25, 2022 07:00
@Haplois Haplois disabled auto-merge August 25, 2022 09:39
@Haplois Haplois merged commit 751b22d into main Aug 25, 2022
@Haplois Haplois deleted the dev/haplois/net67 branch August 25, 2022 09:40
lbussell added a commit to dotnet/installer that referenced this pull request Sep 13, 2022
* Add runtime patch to fully qualify conflicting runtime and roslyn APIs

* Add aspnetcore patch for lifetime scope

* Add prebuilt removal patches for fixes that haven't flowed

* Use repo name for git-info version number special cases

* Delete aspnetcore patches

* Update Microsoft.Deployment.DotNet.Releases Versions.Details.xml dependency

* Remove backported sdk patch

* Add runtime patch to disable analyzers

* Add patch to remove app host prebuilt

* Add source-build patch for jwt prebuilt

* Add patches for command-line-api and msbuild net7.0 TFM

* Update aspnetcore patch

* Update source-build-externals

* Update aspnetcore patch

* Add source-build-externals patch

* Update SBRP version

* Revert tfm patches

* Revert "Revert tfm patches"

This reverts commit 9cf3f5f.

* Revert msbuild net70 tfm patch

* misc updates

* Add linker patch

* Add linker patch

* Add patch for retargeting fsharp

* Add patch for retargeting sdk

* Resolve patch conflict from latest merge

* Remove failing patches

* Remove unnecessary patch

* Re-add msbuild patch for net7.0 TFM

* Revert "Remove failing patches"

This reverts commit 9ca3256.

* Fix fsharp patch

* Fix msbuild patch typo

* Update fsharp patch

* Clean up SDK patch

* Resolve patch conflicts from last merge

* Fix discrepancy between versions of DotNetDeltaApplier TFM version

* Update SDK patch

* Fix fsharp patch

* Fix msbuild build error

* Update nuget-client to net7.0

* Update order of projects in known-good

* Fix fsharp xml doc path for net7.0

* Add missing change in msbuild patch

* Fix SDK patch

* Add runtime patch for targeting net7.0

* Fix runtime-portable build

* Add patch for roslyn-analyzers net7.0 TFM

* Fix runtime patches

* Add patch for targeting net7.0 in roslyn

* Fix Microsoft.CSharp.Core.targets location

* Update patches

* Update roslyn patch

* Update prebuilts version

* Update roslyn patch again

* Add vstest patch for targeting net7.0

* Change minimum supported TFM in runtime

* Revert "Add vstest patch for targeting net7.0"

This reverts commit 9049c9f.

* Add patch to update compatibility suppressions in runtime

* Use dev/haplois/net67 branch of vstest for validation. PR: microsoft/vstest#3944

* Get rid of 2.0.X prebuilts from xliff

* Disable targeting windows in roslyn for source-build

* Delete backported runtime patches

* Fix xliff patch

* Remove backported roslyn patch

* Remove backported fsharp patch

* Update SDK patch

* Remove backported source build patches

* Update patches

* Remove roslyn patch for net7.0 TFM

* Update SDK patch roslyn bits location

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants