Update to ODL 9.x preview, .NET 10 support and bump version to 3.x preview1 #59
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <Project> | ||
| <!-- Set the version number: major, minor, build and release (i.e. alpha, beta or blank for RTM)--> | ||
| <PropertyGroup> | ||
| <VersionMajor Condition="'$(VersionMajor)' == ''">3</VersionMajor> | ||
| <VersionMinor Condition="'$(VersionMinor)' == ''">0</VersionMinor> | ||
| <VersionBuild Condition="'$(VersionBuild)' == ''">0</VersionBuild> | ||
| <VersionRelease Condition="'$(VersionRelease)' == ''">preview.1</VersionRelease> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- For NuGet Package Dependencies --> | ||
| <PropertyGroup> | ||
| <ODataLibPackageDependency>[9.0.0-preview.3, 10.0.0)</ODataLibPackageDependency> | ||
|
Member
Author
There was a problem hiding this comment. @gathogojr This should work. It ensures the package uses ODL
Member
Author
There was a problem hiding this comment. I could bump the version in a different PR
Contributor
There was a problem hiding this comment. @WanjohiSammy I think the version is fine. What I was curious about is whether the part |
||
| <SystemComponentPackageDependency>[4.6.0,)</SystemComponentPackageDependency> | ||
| </PropertyGroup> | ||
|
|
||
|
|
||
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,23 @@ namespace Microsoft.OData.ModelBuilder | |
| public static class PrimitivePropertyConfigurationExtensions | ||
| { | ||
| /// <summary> | ||
| /// If this primitive property is <see cref="System.DateTime"/> or <see cref="System.DateOnly"/>, this method will make the target | ||
| /// Edm type kind as <see cref="EdmPrimitiveTypeKind.Date"/> | ||
| /// </summary> | ||
| /// <param name="property">Reference to the calling primitive property configuration.</param> | ||
| /// <returns>Returns itself so that multiple calls can be chained.</returns> | ||
| public static PrimitivePropertyConfiguration AsDate(this PrimitivePropertyConfiguration property) | ||
| { | ||
| return property.AsDateOnly(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// If this primitive property is <see cref="System.DateTime"/> or <see cref="System.DateOnly"/>, this method will make the target | ||
| /// Edm type kind as <see cref="EdmPrimitiveTypeKind.Date"/> | ||
| /// </summary> | ||
| /// <param name="property">Reference to the calling primitive property configuration.</param> | ||
| /// <returns>Returns itself so that multiple calls can be chained.</returns> | ||
| public static PrimitivePropertyConfiguration AsDateOnly(this PrimitivePropertyConfiguration property) | ||
| { | ||
| if (property == null) | ||
| { | ||
|
|
@@ -35,18 +46,29 @@ public static PrimitivePropertyConfiguration AsDate(this PrimitivePropertyConfig | |
|
|
||
| /// <summary> | ||
| /// If this primitive property is <see cref="System.TimeSpan"/>, this method will make the target | ||
| /// Edm type kind as <see cref="EdmPrimitiveTypeKind.TimeOfDay"/> | ||
| /// </summary> | ||
| /// <param name="property">Reference to the calling primitive property configuration.</param> | ||
| /// <returns>Returns itself so that multiple calls can be chained.</returns> | ||
| public static PrimitivePropertyConfiguration AsTimeOfDay(this PrimitivePropertyConfiguration property) | ||
| { | ||
| return property.AsTimeOnly(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// If this primitive property is <see cref="System.TimeSpan"/> or <see cref="System.TimeOnly"/>, this method will make the target | ||
| /// Edm type kind as <see cref="EdmPrimitiveTypeKind.TimeOfDay"/> | ||
| /// </summary> | ||
| /// <param name="property">Reference to the calling primitive property configuration.</param> | ||
| /// <returns>Returns itself so that multiple calls can be chained.</returns> | ||
| public static PrimitivePropertyConfiguration AsTimeOnly(this PrimitivePropertyConfiguration property) | ||
|
Contributor
There was a problem hiding this comment. Again, I'm a bit confused here. This method is named
Member
Author
There was a problem hiding this comment. The The
Contributor
There was a problem hiding this comment. @WanjohiSammy Why can't one of Same argument around
Member
Author
There was a problem hiding this comment. @gathogojr This is updated with this commit b25d32e |
||
| { | ||
| if (property == null) | ||
| { | ||
| throw Error.ArgumentNull("property"); | ||
| } | ||
|
|
||
| if (!TypeHelper.IsTimeSpan(property.RelatedClrType) && !TypeHelper.IsTimeOnly(property.RelatedClrType)) | ||
| { | ||
| throw Error.Argument("property", SRResources.MustBeTimeSpanProperty, property.PropertyInfo.Name, | ||
| property.DeclaringType.FullName); | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should add
dev-3.xrather replacerelease-1.x, just in case one was to create a pull request against therelease-1.xbranchThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is updated through commit 43762ce