Merge pull request #306 from microsoft/feature/net7

baywet · web-flow · commit caccd8562228 · 2022-11-14T07:26:18.000-05:00
- upgrades to dotnet 7
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -33,9 +33,14 @@ stages:
       steps:
 
       - task: UseDotNet@2
-        displayName: 'Use .NET 6'
+        displayName: 'Use .NET 2' # needed for ESRP signing
         inputs:
-          version: 6.x
+          version: 2.x
+
+      - task: UseDotNet@2
+        displayName: 'Use .NET 7'
+        inputs:
+          version: 7.x
 
       - task: PoliCheck@1
         displayName: 'Run PoliCheck "/src"'
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3.0.3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Data gatherer
         id: data_gatherer
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3.0.3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,8 +6,8 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/tool/UpdateDocs/bin/Debug/net6.0/UpdateDocs.dll",
-            "cwd": "${workspaceFolder}/tool/UpdateDocs/bin/Debug/net6.0",
+            "program": "${workspaceFolder}/tool/UpdateDocs/bin/Debug/net7.0/UpdateDocs.dll",
+            "cwd": "${workspaceFolder}/tool/UpdateDocs/bin/Debug/net7.0",
             "console": "internalConsole",
             "stopAtEntry": false
         },
diff --git a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
@@ -47,16 +47,16 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.OData.Edm" Version="7.10.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.4.1" />
+    <PackageReference Include="Microsoft.OData.Edm" Version="7.12.5" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.4.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="icon.png" Pack="true" PackagePath="\"/>
+    <None Include="icon.png" Pack="true" PackagePath="\" />
     <Compile Update="Properties\SRResource.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
diff --git a/src/OoasGui/OoasGui.csproj b/src/OoasGui/OoasGui.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/src/OoasUtil/OoasUtil.csproj b/src/OoasUtil/OoasUtil.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Common/EdmModelHelper.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Common/EdmModelHelper.cs
@@ -358,7 +358,7 @@ public void MultipleInheritanceEdmModelMetadataDocumentTest()
         <Property Name=""Name"" Type=""Edm.String"" Nullable=""false"" />
       </EntityType>
       <EntityType Name=""Horse"" BaseType=""NS.Animal"" OpenType=""true"">
-        <Property Name=""Height"" Type=""Edm.Decimal"" Nullable=""false"" />
+        <Property Name=""Height"" Type=""Edm.Decimal"" Nullable=""false"" Scale=""Variable"" />
       </EntityType>
       <ComplexType Name=""Plant"" Abstract=""true"" OpenType=""true"">
         <Property Name=""Color"" Type=""NS.Color"" Nullable=""false"" />
@@ -374,7 +374,7 @@ public void MultipleInheritanceEdmModelMetadataDocumentTest()
         <Property Name=""Name"" Type=""Edm.String"" Nullable=""false"" />
       </ComplexType>
       <ComplexType Name=""Tree"" BaseType=""NS.LandPlant"" OpenType=""true"">
-        <Property Name=""Price"" Type=""Edm.Decimal"" Nullable=""false"" />
+        <Property Name=""Price"" Type=""Edm.Decimal"" Nullable=""false"" Scale=""Variable"" />
       </ComplexType>
       <ComplexType Name=""Flower"" BaseType=""NS.LandPlant"" OpenType=""true"">
         <Property Name=""Height"" Type=""Edm.Double"" Nullable=""false"" />
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSchemaGeneratorTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSchemaGeneratorTests.cs
@@ -493,7 +493,6 @@ public void CreateComplexTypeWithBaseSchemaReturnCorrectSchema()
       ""type"": ""object"",
       ""properties"": {
         ""Price"": {
-          ""multipleOf"": 1,
           ""oneOf"": [
             {
               ""type"": ""number"",
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
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Microsoft.OpenApi.OData.Reader.Tests</AssemblyName>
     <RootNamespace>Microsoft.OpenApi.OData.Reader.Tests</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\tool\Microsoft.OpenApi.OData.snk</AssemblyOriginatorKeyFile>
@@ -62,10 +62,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.4.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.4.3" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json
@@ -4348,7 +4348,6 @@
         },
         "FileSized": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "FileClientPath": {
@@ -4368,17 +4367,14 @@
         },
         "IsNa": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "IsRejected": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "IsReviewed": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "NaDescription": {
@@ -4436,7 +4432,6 @@
         },
         "IsApproved": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "CategoryId": {
@@ -4746,7 +4741,6 @@
         },
         "TotalSize": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "FilesCounter": {
@@ -5169,7 +5163,6 @@
         },
         "Sized": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "ActualName": {
@@ -5210,12 +5203,10 @@
         },
         "Latitude": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "Longitude": {
           "format": "decimal",
-          "multipleOf": 1,
           "type": "number"
         },
         "Documents": {
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml
@@ -3152,7 +3152,6 @@ definitions:
         type: string
       FileSized:
         format: decimal
-        multipleOf: 1
         type: number
       FileClientPath:
         type: string
@@ -3168,15 +3167,12 @@ definitions:
         type: integer
       IsNa:
         format: decimal
-        multipleOf: 1
         type: number
       IsRejected:
         format: decimal
-        multipleOf: 1
         type: number
       IsReviewed:
         format: decimal
-        multipleOf: 1
         type: number
       NaDescription:
         type: string
@@ -3221,7 +3217,6 @@ definitions:
         type: integer
       IsApproved:
         format: decimal
-        multipleOf: 1
         type: number
       CategoryId:
         format: int32
@@ -3463,7 +3458,6 @@ definitions:
         type: integer
       TotalSize:
         format: decimal
-        multipleOf: 1
         type: number
       FilesCounter:
         format: int32
@@ -3794,7 +3788,6 @@ definitions:
         type: string
       Sized:
         format: decimal
-        multipleOf: 1
         type: number
       ActualName:
         type: string
@@ -3827,11 +3820,9 @@ definitions:
         type: integer
       Latitude:
         format: decimal
-        multipleOf: 1
         type: number
       Longitude:
         format: decimal
-        multipleOf: 1
         type: number
       Documents:
         type: array
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.json
@@ -4980,7 +4980,6 @@
             "nullable": true
           },
           "FileSized": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal"
           },
@@ -5002,19 +5001,16 @@
             "format": "int32"
           },
           "IsNa": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal",
             "nullable": true
           },
           "IsRejected": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal",
             "nullable": true
           },
           "IsReviewed": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal",
             "nullable": true
@@ -5085,7 +5081,6 @@
             "nullable": true
           },
           "IsApproved": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal",
             "nullable": true
@@ -5472,7 +5467,6 @@
             "format": "int32"
           },
           "TotalSize": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal"
           },
@@ -5965,7 +5959,6 @@
             "format": "date-time"
           },
           "Sized": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal"
           },
@@ -6011,13 +6004,11 @@
             "nullable": true
           },
           "Latitude": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal",
             "nullable": true
           },
           "Longitude": {
-            "multipleOf": 1,
             "type": "number",
             "format": "decimal",
             "nullable": true
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.yaml
@@ -3599,7 +3599,6 @@ components:
           format: date-time
           nullable: true
         FileSized:
-          multipleOf: 1
           type: number
           format: decimal
         FileClientPath:
@@ -3617,17 +3616,14 @@ components:
           type: integer
           format: int32
         IsNa:
-          multipleOf: 1
           type: number
           format: decimal
           nullable: true
         IsRejected:
-          multipleOf: 1
           type: number
           format: decimal
           nullable: true
         IsReviewed:
-          multipleOf: 1
           type: number
           format: decimal
           nullable: true
@@ -3685,7 +3681,6 @@ components:
           format: int32
           nullable: true
         IsApproved:
-          multipleOf: 1
           type: number
           format: decimal
           nullable: true
@@ -3964,7 +3959,6 @@ components:
           type: integer
           format: int32
         TotalSize:
-          multipleOf: 1
           type: number
           format: decimal
         FilesCounter:
@@ -4340,7 +4334,6 @@ components:
           type: string
           format: date-time
         Sized:
-          multipleOf: 1
           type: number
           format: decimal
         ActualName:
@@ -4378,12 +4371,10 @@ components:
           format: int32
           nullable: true
         Latitude:
-          multipleOf: 1
           type: number
           format: decimal
           nullable: true
         Longitude:
-          multipleOf: 1
           type: number
           format: decimal
           nullable: true
diff --git a/tool/UpdateDocs/UpdateDocs.csproj b/tool/UpdateDocs/UpdateDocs.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,6 @@ public void CreateComplexTypeWithBaseSchemaReturnCorrectSchema()`
`493`	`493`	`""type"": ""object"",`
`494`	`494`	`""properties"": {`
`495`	`495`	`""Price"": {`
`496`		`- ""multipleOf"": 1,`
`497`	`496`	`""oneOf"": [`
`498`	`497`	`{`
`499`	`498`	`""type"": ""number"",`