Merge branch 'main' into feat/upgrade-oai

baywet · baywet · commit 9029a2f09c80 · 2025-03-19T12:28:42.000-04:00
Signed-off-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -148,14 +148,6 @@ extends:
               projects: src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
               arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
 
-          - task: PowerShell@2
-            displayName: 'Validate project version has been incremented'
-            condition: and(contains(variables['build.sourceBranch'], 'refs/tags/v'), succeeded())
-            inputs:
-              targetType: 'filePath'
-              filePath: $(System.DefaultWorkingDirectory)\scripts\ValidateProjectVersionUpdated.ps1
-              pwsh: true
-
           - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
             displayName: 'ESRP CodeSigning Nuget Packages'
             inputs:
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "2.0.0-preview9"
+  ".": "2.0.0-preview.11"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## [2.0.0-preview.11](https://github.com/microsoft/OpenAPI.NET.OData/compare/v2.0.0-preview.10...v2.0.0-preview.11) (2025-03-19)
+
+
+### Bug Fixes
+
+* bump oai version ([caa2055](https://github.com/microsoft/OpenAPI.NET.OData/commit/caa2055e039298d4471f265797b6f6be381a03ce))
+* bump oai version ([d40746c](https://github.com/microsoft/OpenAPI.NET.OData/commit/d40746c055af4d7d7a5ae8fec3baeb862ab8ad56))
+
+## [2.0.0-preview.10](https://github.com/microsoft/OpenAPI.NET.OData/compare/v2.0.0-preview10...v2.0.0-preview.10) (2025-03-18)
+
+
+### Miscellaneous Chores
+
+* release 2.0.0-preview.10 ([5cd79d7](https://github.com/microsoft/OpenAPI.NET.OData/commit/5cd79d76cc63ab3c311351f8e661b2bd7b88b35b))
+
+## [2.0.0-preview10](https://github.com/microsoft/OpenAPI.NET.OData/compare/v2.0.0-preview9...v2.0.0-preview10) (2025-03-18)
+
+
+### Features
+
+* bump openapi.net packages to the latest preview. ([d8b9f3f](https://github.com/microsoft/OpenAPI.NET.OData/commit/d8b9f3f15a2586646fb78bf803ecf7a11db1d053))
+* migrates to the latest preview of OAI.net ([3295eb9](https://github.com/microsoft/OpenAPI.NET.OData/commit/3295eb9faec51b77bfd089a80539a0cbeea41641))
+
+
+### Bug Fixes
+
+* disable failing test for now. ([6f52acc](https://github.com/microsoft/OpenAPI.NET.OData/commit/6f52acc33d66dd9c55ed6952e8b4472364ccefb7))
+
 ## [2.0.0-preview9](https://github.com/microsoft/OpenAPI.NET.OData/compare/v2.0.0-preview8...v2.0.0-preview9) (2025-02-25)
 
 
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,7 @@
     <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET.OData</PackageProjectUrl>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>Microsoft OpenApi OData EDM</PackageTags>
-    <Version>2.0.0-preview9</Version>
+    <Version>2.0.0-preview.11</Version>
   </PropertyGroup>
   <!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
diff --git a/scripts/ValidateProjectVersionUpdated.ps1 b/scripts/ValidateProjectVersionUpdated.ps1
diff --git a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
@@ -29,12 +29,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.13" />
-	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
-	<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
-	  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	  <PrivateAssets>all</PrivateAssets>
-	</PackageReference>
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.15" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs
@@ -9,6 +9,7 @@
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary.Core;
+using System.Collections.Generic;
 
 namespace Microsoft.OpenApi.OData.Operation;
 
@@ -35,7 +36,7 @@ protected override void Initialize(ODataContext context, ODataPath path)
     protected override void SetTags(OpenApiOperation operation)
     {
         string tagName = EdmModelHelper.GenerateComplexPropertyPathTagName(Path, Context);
-
+        operation.Tags ??= new HashSet<OpenApiTagReference>();
         if (!string.IsNullOrEmpty(tagName))
         {
             Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/DollarCountGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/DollarCountGetOperationHandler.cs
@@ -85,6 +85,8 @@ private void AddODataSegmentToAnnotables(ODataSegment oDataSegment, ODataSegment
         protected override void SetTags(OpenApiOperation operation)
         {
             string tagName = null;
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
+
             if (SecondLastSegment is ODataNavigationSourceSegment sourceSegment)
             {
                 tagName = TagNameFromNavigationSourceSegment(sourceSegment);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs
@@ -141,6 +141,8 @@ protected override void SetTags(OpenApiOperation operation)
             var tag = CreateTag(EdmOperationImport);
             tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
             Context.AppendTag(tag);
+
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tag.Name, _document));
 
             base.SetTags(operation);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs
@@ -154,6 +154,7 @@ protected override void SetTags(OpenApiOperation operation)
                 Name = tagName,
             };
             tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tag.Name, _document));
 
             Context.AppendTag(tag);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetOperationHandler.cs
@@ -10,6 +10,7 @@
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary.Core;
+using System.Collections.Generic;
 
 namespace Microsoft.OpenApi.OData.Operation
 {
@@ -46,7 +47,7 @@ protected override void Initialize(ODataContext context, ODataPath path)
         protected override void SetTags(OpenApiOperation operation)
         {
             var tagName = EntitySet.Name + "." + EntitySet.EntityType.Name;
-
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tagName, _document));
 
             Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
@@ -96,6 +96,8 @@ protected override void SetTags(OpenApiOperation operation)
 			{
 				Name = tagIdentifier
 			});
+
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tagIdentifier, _document));
         }
 
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs
@@ -99,6 +99,7 @@ protected override void SetTags(OpenApiOperation operation)
 			{
 				Name = name
 			});
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(name, _document));
 
             base.SetTags(operation);
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ODataTypeCastGetOperationHandler.cs
@@ -238,6 +238,7 @@ protected override void SetResponses(OpenApiOperation operation)
 	protected override void SetTags(OpenApiOperation operation)
 	{
         string tagName = null;
+        operation.Tags ??= new HashSet<OpenApiTagReference>();
 
         if (SecondLastSegment is ODataNavigationPropertySegment || isIndexedCollValuedNavProp)
 		{
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonOperationHandler.cs
@@ -10,6 +10,7 @@
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary.Core;
+using System.Collections.Generic;
 
 namespace Microsoft.OpenApi.OData.Operation
 {
@@ -53,7 +54,7 @@ protected override void SetTags(OpenApiOperation operation)
 			{
 				Name = tagName
 			});
-
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tagName, _document));
 
             // Call base.SetTags() at the end of this method.
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj b/test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
@@ -88,7 +88,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.13" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.15" />
     <PackageReference Include="moq" Version="4.20.72" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "2.0.0-preview9"`
	`2`	`+ ".": "2.0.0-preview.11"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.OpenApi.OData.Common;`
`10`	`10`	`using Microsoft.OpenApi.OData.Edm;`
`11`	`11`	`using Microsoft.OpenApi.OData.Vocabulary.Core;`
	`12`	`+using System.Collections.Generic;`
`12`	`13`
`13`	`14`	`namespace Microsoft.OpenApi.OData.Operation;`
`14`	`15`
`@@ -35,7 +36,7 @@ protected override void Initialize(ODataContext context, ODataPath path)`
`35`	`36`	`protected override void SetTags(OpenApiOperation operation)`
`36`	`37`	`{`
`37`	`38`	`string tagName = EdmModelHelper.GenerateComplexPropertyPathTagName(Path, Context);`
`38`		`-`
	`39`	`+ operation.Tags ??= new HashSet<OpenApiTagReference>();`
`39`	`40`	`if (!string.IsNullOrEmpty(tagName))`
`40`	`41`	`{`
`41`	`42`	`Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,8 @@ private void AddODataSegmentToAnnotables(ODataSegment oDataSegment, ODataSegment`
`85`	`85`	`protected override void SetTags(OpenApiOperation operation)`
`86`	`86`	`{`
`87`	`87`	`string tagName = null;`
	`88`	`+ operation.Tags ??= new HashSet<OpenApiTagReference>();`
	`89`	`+`
`88`	`90`	`if (SecondLastSegment is ODataNavigationSourceSegment sourceSegment)`
`89`	`91`	`{`
`90`	`92`	`tagName = TagNameFromNavigationSourceSegment(sourceSegment);`