Upgrade IESI to 4.0.4 for having a bumped file version. #1598
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
And let dot settings get updated by JetBrains.
hazzik
requested changes
Mar 8, 2018
src/NHibernate.sln.DotSettings
Outdated
| @@ -1,13 +1,16 @@ | |||
| <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | |||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CommonFormatter/ALIGNMENT_TAB_FILL_STYLE/@EntryValue">USE_SPACES</s:String> | |||
There was a problem hiding this comment.
And let dot settings get updated by JetBrains.
And because Rider/R# migrate it to others settings at each solution opening, which is a nuisance for many contributors.
src/NHibernate.sln.DotSettings
Outdated
| @@ -1,13 +1,16 @@ | |||
| <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"> | |||
| <s:String x:Key="/Default/CodeStyle/CodeFormatting/CommonFormatter/ALIGNMENT_TAB_FILL_STYLE/@EntryValue">USE_SPACES</s:String> | |||
There was a problem hiding this comment.
Why this file is even in this PR?
There was a problem hiding this comment.
Because previous migrations have been handled the same way, letting it go at some point in some unrelated PR.
src/NHibernate/NHibernate.csproj
Outdated
| <ItemGroup> | ||
| <PackageReference Include="Antlr3.CodeGenerator" Version="3.5.2-beta1"> | ||
| <PrivateAssets>All</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Antlr3.Runtime" Version="[3.5.1, 4.0)" /> | ||
| <PackageReference Include="Iesi.Collections" Version="[4.0.3, 5.0)" /> | ||
| <PackageReference Include="Iesi.Collections" Version="4.0.4" /> |
src/NHibernate/NHibernate.csproj
Outdated
| <PackageReference Include="Remotion.Linq" Version="[2.1.2, 3.0)" /> | ||
| <PackageReference Include="Remotion.Linq.EagerFetching" Version="[2.1.0, 3.0)" /> | ||
| </ItemGroup> | ||
|
|
There was a problem hiding this comment.
Done by the tooling (Rider).
|
Fully reverted and redone manually. |
hazzik
approved these changes
Mar 9, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
And let dot settings get updated by JetBrains.