Skip to content

- upgrades to dotnet 7 #306

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.

Sign up for GitHub

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 3 commits into from
Nov 14, 2022
Merged

- upgrades to dotnet 7 #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d441cfe
- upgrades to dotnet 7
baywet Nov 8, 2022
60e8fe5
- adds dotnet 6 back for ESRP signing
baywet Nov 10, 2022
5de5ad6
- switches to net2 for ESRP
baywet Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .azure-pipelines/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/[email protected]
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x

- name: Data gatherer
id: data_gatherer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Setup .NET
uses: actions/[email protected]
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/OoasGui/OoasGui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/OoasUtil/OoasUtil.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Common/EdmModelHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"" />
Expand All @@ -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"" />
Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSchemaGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,6 @@ public void CreateComplexTypeWithBaseSchemaReturnCorrectSchema()
""type"": ""object"",
""properties"": {
""Price"": {
""multipleOf"": 1,
""oneOf"": [
{
""type"": ""number"",
Expand Down
10 changes: 5 additions & 5 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
9 changes: 0 additions & 9 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4348,7 +4348,6 @@
},
"FileSized": {
"format": "decimal",
"multipleOf": 1,
"type": "number"
},
"FileClientPath": {
Expand All @@ -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": {
Expand Down Expand Up @@ -4436,7 +4432,6 @@
},
"IsApproved": {
"format": "decimal",
"multipleOf": 1,
"type": "number"
},
"CategoryId": {
Expand Down Expand Up @@ -4746,7 +4741,6 @@
},
"TotalSize": {
"format": "decimal",
"multipleOf": 1,
"type": "number"
},
"FilesCounter": {
Expand Down Expand Up @@ -5169,7 +5163,6 @@
},
"Sized": {
"format": "decimal",
"multipleOf": 1,
"type": "number"
},
"ActualName": {
Expand Down Expand Up @@ -5210,12 +5203,10 @@
},
"Latitude": {
"format": "decimal",
"multipleOf": 1,
"type": "number"
},
"Longitude": {
"format": "decimal",
"multipleOf": 1,
"type": "number"
},
"Documents": {
Expand Down
9 changes: 0 additions & 9 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3152,7 +3152,6 @@ definitions:
type: string
FileSized:
format: decimal
multipleOf: 1
type: number
FileClientPath:
type: string
Expand All @@ -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
Expand Down Expand Up @@ -3221,7 +3217,6 @@ definitions:
type: integer
IsApproved:
format: decimal
multipleOf: 1
type: number
CategoryId:
format: int32
Expand Down Expand Up @@ -3463,7 +3458,6 @@ definitions:
type: integer
TotalSize:
format: decimal
multipleOf: 1
type: number
FilesCounter:
format: int32
Expand Down Expand Up @@ -3794,7 +3788,6 @@ definitions:
type: string
Sized:
format: decimal
multipleOf: 1
type: number
ActualName:
type: string
Expand Down Expand Up @@ -3827,11 +3820,9 @@ definitions:
type: integer
Latitude:
format: decimal
multipleOf: 1
type: number
Longitude:
format: decimal
multipleOf: 1
type: number
Documents:
type: array
Expand Down
9 changes: 0 additions & 9 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4980,7 +4980,6 @@
"nullable": true
},
"FileSized": {
"multipleOf": 1,
"type": "number",
"format": "decimal"
},
Expand All @@ -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
Expand Down Expand Up @@ -5085,7 +5081,6 @@
"nullable": true
},
"IsApproved": {
"multipleOf": 1,
"type": "number",
"format": "decimal",
"nullable": true
Expand Down Expand Up @@ -5472,7 +5467,6 @@
"format": "int32"
},
"TotalSize": {
"multipleOf": 1,
"type": "number",
"format": "decimal"
},
Expand Down Expand Up @@ -5965,7 +5959,6 @@
"format": "date-time"
},
"Sized": {
"multipleOf": 1,
"type": "number",
"format": "decimal"
},
Expand Down Expand Up @@ -6011,13 +6004,11 @@
"nullable": true
},
"Latitude": {
"multipleOf": 1,
"type": "number",
"format": "decimal",
"nullable": true
},
"Longitude": {
"multipleOf": 1,
"type": "number",
"format": "decimal",
"nullable": true
Expand Down
9 changes: 0 additions & 9 deletions test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3599,7 +3599,6 @@ components:
format: date-time
nullable: true
FileSized:
multipleOf: 1
type: number
format: decimal
FileClientPath:
Expand All @@ -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
Expand Down Expand Up @@ -3685,7 +3681,6 @@ components:
format: int32
nullable: true
IsApproved:
multipleOf: 1
type: number
format: decimal
nullable: true
Expand Down Expand Up @@ -3964,7 +3959,6 @@ components:
type: integer
format: int32
TotalSize:
multipleOf: 1
type: number
format: decimal
FilesCounter:
Expand Down Expand Up @@ -4340,7 +4334,6 @@ components:
type: string
format: date-time
Sized:
multipleOf: 1
type: number
format: decimal
ActualName:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tool/UpdateDocs/UpdateDocs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down