Skip to content
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.

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

Allow tool to roll forward through major versions. #11

Merged
merged 4 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,12 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- name: Install .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
8.0.x
- name: Check out code
uses: actions/checkout@v3
with:
fetch-depth: 0 # required to publish docs
- name: Install .NET
uses: actions/setup-dotnet@v4
- name: Restore
run: .\build.ps1 restore
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>

<PropertyGroup>
<VersionPrefix>2.10.0</VersionPrefix>
<PackageValidationBaselineVersion>2.9.0</PackageValidationBaselineVersion>
<VersionPrefix>2.11.0</VersionPrefix>
<PackageValidationBaselineVersion>2.10.0</PackageValidationBaselineVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CodeGenCore" Version="0.3.1" />
<PackageVersion Include="Facility.CodeGen.Console" Version="2.14.0" />
<PackageVersion Include="Facility.Definition" Version="2.14.0" />
<PackageVersion Include="Facility.CodeGen.Console" Version="2.15.0" />
<PackageVersion Include="Facility.Definition" Version="2.15.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="NUnit" Version="4.1.0" />
Expand Down
5 changes: 5 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Release Notes

## 2.11.0

* Drop support for end-of-life frameworks.
* Use roll forward with .NET tool.

## 2.10.0

* Support events.
Expand Down
2 changes: 1 addition & 1 deletion dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"facilityconformance": {
"version": "2.29.0",
"version": "2.30.0",
"commands": [
"FacilityConformance"
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<Description>A library that generates Markdown for a Facility Service Definition.</Description>
<PackageTags>Facility FSD Markdown CodeGen</PackageTags>
<IsPackable>true</IsPackable>
Expand Down
3 changes: 2 additions & 1 deletion src/fsdgenmd/fsdgenmd.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Description>A tool that generates Markdown for a Facility Service Definition.</Description>
<PackageTags>Facility FSD Markdown CodeGen</PackageTags>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<RollForward>Major</RollForward>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion tools/Build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ void CodeGen(bool verify)
RunCodeGen("conformance/ConformanceApi.fsd", "conformance/no-http/", "--no-http");

void RunCodeGen(params string?[] args) =>
RunDotNet(new[] { "run", "--no-build", "--project", $"src/{codegen}", "-f", "net6.0", "-c", configuration, "--", "--newline", "lf", verifyOption }.Concat(args));
RunDotNet(new[] { "run", "--no-build", "--project", $"src/{codegen}", "-c", configuration, "--", "--newline", "lf", verifyOption }.Concat(args));
}
});
Loading