Skip to content

Merge upstream #171

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

Merged
merged 26 commits into from
Dec 21, 2023
Merged

Merge upstream #171

merged 26 commits into from
Dec 21, 2023

Conversation

SergeiPavlov
Copy link
Collaborator

No description provided.

alex-kulakov and others added 26 commits August 18, 2023 16:13
- changed project build configurations
- changed packages for certain cases
# Conflicts:
#	Orm/Xtensive.Orm/Orm/Building/Builders/ValueTypeBuilder.cs
+ fix issue of wrong condition in global props
- buildMultitargeting folder is used when referencing project uses
  multiple targets
- buildTransitive folder allows to install only provider package and
  targets will be introduced to build process transitively

  build folder remains for backwards compatibility
# Conflicts:
#	Orm/Xtensive.Orm.SqlServer/Xtensive.Orm.SqlServer.csproj
Removes NET5 from target frameworks and adds NET7, NET8
@SergeiPavlov SergeiPavlov merged commit e20b684 into master-servicetitan Dec 21, 2023
@SergeiPavlov SergeiPavlov deleted the mergeUpstream branch December 21, 2023 00:15
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.

2 participants