Skip to content

Commit

Permalink
Add target framework net 6 for fluent metadata (#14)
Browse files Browse the repository at this point in the history
* Add target framework net 6 for fluent metadata and upgrade OpenRiaServices to 5.1.2

* Update azure-pipelines.yml

* add back nuget and dotnet sdk

* Use nuget 6.3.1

Co-authored-by: Daniel Svensson <daniel.svensson@hotmail.se>
  • Loading branch information
lindellhugo and Daniel-Svensson authored Oct 27, 2022
1 parent cbea6d6 commit 803074c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OpenRiaServices.Hosting.Wcf">
<Version>5.0.0</Version>
<Version>5.1.2</Version>
</PackageReference>
<PackageReference Include="OpenRiaServices.Server">
<Version>5.0.0</Version>
<Version>5.1.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="OpenRiaServices.Client.Core" Version="5.0.0" />
<PackageReference Include="OpenRiaServices.Client.CodeGen" Version="5.0.0">
<PackageReference Include="OpenRiaServices.Client.Core" Version="5.1.2" />
<PackageReference Include="OpenRiaServices.Client.CodeGen" Version="5.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions FluentMetadata/OpenRiaServices.Server.FluentMetadata.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<Description>library that provides a fluent configuration interface for configuring domain services.</Description>
<PackageId>OpenRiaServices.FluentMetadata</PackageId>
<GeneratePackageOnBuild Condition="'$(BUILD_BUILDID)' != ''">true</GeneratePackageOnBuild>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenRiaServices.Server" Version="5.0.0" />
<PackageReference Include="OpenRiaServices.Server" Version="5.1.2" />
</ItemGroup>

</Project>
12 changes: 10 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# .NET Desktop
# Build and run tests for .NET Desktop or Windows classic desktop solutions.
# Add steps that publish symbols, save build artifacts, and more:
# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net

trigger:
Expand All @@ -25,6 +24,15 @@ steps:
inputs:
versionSpec: '5.x'

- task: NuGetToolInstaller@1
inputs:
versionSpec: '6.3.1'

- task: UseDotNet@2
inputs:
packageType: 'sdk'
version: '6.x'

- task: gitversion/execute@0
displayName: Use GitVersion

Expand Down Expand Up @@ -75,4 +83,4 @@ steps:

- task: SonarCloudPublish@1
inputs:
pollingTimeoutSec: '300'
pollingTimeoutSec: '300'

0 comments on commit 803074c

Please sign in to comment.