From 40d85f9e6a2029118bee0f451a2b17f3ae5cb234 Mon Sep 17 00:00:00 2001 From: Luiz Henrique Cassettari Date: Sun, 19 Nov 2023 14:10:57 -0300 Subject: [PATCH] Update `Build` --- .github/workflows/{Publish.yml => Build.yml} | 16 ++++--- .github/workflows/Develop.yml | 33 ------------- Build/.nuke/build.schema.json | 10 ++++ Build/Build.cs | 2 +- CHANGELOG.md | 7 +++ Directory.Build.props | 5 ++ README.md | 3 +- .../ricaun.Revit.UI.Example.csproj | 7 +-- ricaun.Revit.UI.sln | 1 + ricaun.Revit.UI/ricaun.Revit.UI.csproj | 47 +++++-------------- 10 files changed, 47 insertions(+), 84 deletions(-) rename .github/workflows/{Publish.yml => Build.yml} (88%) delete mode 100644 .github/workflows/Develop.yml create mode 100644 Directory.Build.props diff --git a/.github/workflows/Publish.yml b/.github/workflows/Build.yml similarity index 88% rename from .github/workflows/Publish.yml rename to .github/workflows/Build.yml index c746b74..290cf5c 100644 --- a/.github/workflows/Publish.yml +++ b/.github/workflows/Build.yml @@ -1,29 +1,31 @@ # ------------------------------------------------------------------------------ -# Publish.yml +# Build.yml # ------------------------------------------------------------------------------ -name: Publish +name: Build on: push: - branches: + pull_request: + branches-ignore: - master + - main workflow_dispatch: jobs: - Publish: - name: Publish + Build: + name: Build runs-on: windows-latest steps: - uses: actions/checkout@v1 - name: NuGet Setup - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: dotnet-version: 7.0.x - name: "NuGet Add Source Organization" run: if ("${{ secrets.ORGANIZATION_SOURCE_PACKAGE_PASSWORD }}" -ne "") { dotnet nuget add source --username ${{ secrets.ORGANIZATION_SOURCE_PACKAGE_USERNAME }} --password ${{ secrets.ORGANIZATION_SOURCE_PACKAGE_PASSWORD }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{github.repository_owner}}/index.json" } - + - name: Run './build/build.cmd' run: ./build/build.cmd --root ./build env: diff --git a/.github/workflows/Develop.yml b/.github/workflows/Develop.yml deleted file mode 100644 index f800150..0000000 --- a/.github/workflows/Develop.yml +++ /dev/null @@ -1,33 +0,0 @@ -# ------------------------------------------------------------------------------ -# Develop.yml -# ------------------------------------------------------------------------------ - -name: Develop - -on: - push: - branches-ignore: - - master - pull_request: - branches-ignore: - - master - workflow_dispatch: - -jobs: - Develop: - name: Develop - runs-on: windows-latest - steps: - - uses: actions/checkout@v1 - - - name: NuGet Setup - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 7.0.x - - name: "NuGet Add Source Organization" - run: if ("${{ secrets.ORGANIZATION_SOURCE_PACKAGE_PASSWORD }}" -ne "") { dotnet nuget add source --username ${{ secrets.ORGANIZATION_SOURCE_PACKAGE_USERNAME }} --password ${{ secrets.ORGANIZATION_SOURCE_PACKAGE_PASSWORD }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{github.repository_owner}}/index.json" } - - - name: Run './build/build.cmd' - run: ./build/build.cmd --root ./build - env: - GitHubToken: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/Build/.nuke/build.schema.json b/Build/.nuke/build.schema.json index 67a658a..1421ad0 100644 --- a/Build/.nuke/build.schema.json +++ b/Build/.nuke/build.schema.json @@ -80,6 +80,12 @@ "type": "boolean", "description": "Shows the execution plan (HTML)" }, + "PreReleaseFilter": { + "type": "array", + "items": { + "type": "string" + } + }, "Profile": { "type": "array", "description": "Defines the profiles to load", @@ -126,9 +132,11 @@ "Build", "Clean", "Compile", + "GitPreRelease", "GitRelease", "Pack", "PackageBuilder", + "PrePack", "Release", "Sign", "TestLocal" @@ -148,9 +156,11 @@ "Build", "Clean", "Compile", + "GitPreRelease", "GitRelease", "Pack", "PackageBuilder", + "PrePack", "Release", "Sign", "TestLocal" diff --git a/Build/Build.cs b/Build/Build.cs index aee888b..4db5f29 100644 --- a/Build/Build.cs +++ b/Build/Build.cs @@ -3,7 +3,7 @@ using ricaun.Nuke; using ricaun.Nuke.Components; -class Build : NukeBuild, IPublishPack, IRevitPackageBuilder, ITestLocal +class Build : NukeBuild, IPublishPack, IRevitPackageBuilder, ITestLocal, IPrePack { string IHazPackageBuilderProject.Name => "Example"; string IHazRevitPackageBuilder.Application => "Revit.App"; diff --git a/CHANGELOG.md b/CHANGELOG.md index 60e014f..34e9e11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [0.6.0] / 2023-11-19 +### Features +- Update to support `net7.0-windows` +### Updated +- Update `Build` project + ## [0.5.7] / 2023-11-17 ### Features - LargeImage changes `TextBox` Image @@ -301,6 +307,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - First Release [vNext]: ../../compare/1.0.0...HEAD +[0.6.0]: ../../compare/0.5.7...0.6.0 [0.5.7]: ../../compare/0.5.6...0.5.7 [0.5.6]: ../../compare/0.5.5...0.5.6 [0.5.5]: ../../compare/0.5.4...0.5.5 diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..8a5037d --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + 0.6.0 + + \ No newline at end of file diff --git a/README.md b/README.md index c4f8ebf..8d3af6c 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ [![Visual Studio 2022](https://img.shields.io/badge/Visual%20Studio-2022-blue)](../..) [![Nuke](https://img.shields.io/badge/Nuke-Build-blue)](https://nuke.build/) [![License MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE) -[![Publish](../../actions/workflows/Publish.yml/badge.svg)](../../actions) -[![Develop](../../actions/workflows/Develop.yml/badge.svg)](../../actions) +[![Build](../../actions/workflows/Build.yml/badge.svg)](../../actions) [![Release](https://img.shields.io/nuget/v/ricaun.Revit.UI?logo=nuget&label=release&color=blue)](https://www.nuget.org/packages/ricaun.Revit.UI) This project was generated by the [ricaun.AppLoader](https://ricaun.com/AppLoader/) Revit plugin, the test project use the [ricaun.RevitTest](https://ricaun.com/RevitTest) test framework. diff --git a/ricaun.Revit.UI.Example/ricaun.Revit.UI.Example.csproj b/ricaun.Revit.UI.Example/ricaun.Revit.UI.Example.csproj index ed2cd43..dbeb8fc 100644 --- a/ricaun.Revit.UI.Example/ricaun.Revit.UI.Example.csproj +++ b/ricaun.Revit.UI.Example/ricaun.Revit.UI.Example.csproj @@ -76,7 +76,7 @@ ricaun.Revit.UI.Example - 0.5.7 + 0.6.0 {f736f68f-7101-4640-9093-8715f88ccb95} @@ -119,7 +119,7 @@ - + @@ -127,9 +127,6 @@ - - - diff --git a/ricaun.Revit.UI.sln b/ricaun.Revit.UI.sln index 646c472..ed3122a 100644 --- a/ricaun.Revit.UI.sln +++ b/ricaun.Revit.UI.sln @@ -8,6 +8,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{A81D2950-B5CB-4CDB-B7FE-9132C730C8CC}" ProjectSection(SolutionItems) = preProject CHANGELOG.md = CHANGELOG.md + Directory.Build.props = Directory.Build.props README.md = README.md EndProjectSection EndProject diff --git a/ricaun.Revit.UI/ricaun.Revit.UI.csproj b/ricaun.Revit.UI/ricaun.Revit.UI.csproj index 65b4d52..70f7746 100644 --- a/ricaun.Revit.UI/ricaun.Revit.UI.csproj +++ b/ricaun.Revit.UI/ricaun.Revit.UI.csproj @@ -6,53 +6,24 @@ AnyCPU true latest - false + true None Debug;Release + + net46;net7.0-windows + - + 2017 - net46 - - - - - 2018 - net46 - - - - - 2019 - net47 - - - - - 2020 - net47 - - - - - 2021 - net48 - - - - - 2022 - net48 - 2017 - net46 + 2025 @@ -76,7 +47,7 @@ ricaun.Revit.UI - 0.5.7 + 0.6.0 {2064ba4d-5527-41e9-8b76-0cbfefa35900} @@ -146,6 +117,10 @@ + + + +