Merge pull request #6 from ricaun-io/develop

Publish on Nuget
ricaun-io · Jan 12, 2022 · bb8f4cc · bb8f4cc
2 parents 9676013 + 700e49d
commit bb8f4cc
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 38 deletions.
diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml
@@ -48,8 +48,8 @@ jobs:
         env:
           GitHubToken: ${{ secrets.GITHUB_TOKEN }}
 
-          NugetApiUrl: "https://nuget.pkg.github.com/${{github.repository_owner}}/index.json"
-          NugetApiKey: ${{ secrets.GITHUB_TOKEN }}
+          NugetApiUrl: ${{ secrets.NUGET_API_URL }}
+          NugetApiKey: ${{ secrets.NUGET_API_KEY }}
 
           SignFile: ${{ secrets.SIGN_FILE }}
           SignPassword: ${{ secrets.SIGN_PASSWORD }}
diff --git a/Build/.nuke/build.schema.json b/Build/.nuke/build.schema.json
@@ -13,6 +13,10 @@
         "Folder": {
           "type": "string"
         },
+        "GitHubToken": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+        },
         "Help": {
           "type": "boolean",
           "description": "Shows the help text for this build assembly"
@@ -37,6 +41,9 @@
             "VSCode"
           ]
         },
+        "IssConfiguration": {
+          "type": "string"
+        },
         "MainName": {
           "type": "string"
         },
@@ -47,6 +54,14 @@
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"
         },
+        "NugetApiKey": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+        },
+        "NugetApiUrl": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+        },
         "Partition": {
           "type": "string",
           "description": "Partition to use on CI"
@@ -62,10 +77,21 @@
             "type": "string"
           }
         },
+        "ReleasePackageBuilder": {
+          "type": "boolean"
+        },
         "Root": {
           "type": "string",
           "description": "Root directory during build execution"
         },
+        "SignFile": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+        },
+        "SignPassword": {
+          "type": "string",
+          "default": "Secrets must be entered via 'nuke :secret [profile]'"
+        },
         "Skip": {
           "type": "array",
           "description": "List of targets to be skipped. Empty list skips all dependencies",
@@ -78,6 +104,7 @@
               "CompileExample",
               "GitRelease",
               "Pack",
+              "PackageBuilder",
               "Release",
               "Sign"
             ]
@@ -99,11 +126,18 @@
               "CompileExample",
               "GitRelease",
               "Pack",
+              "PackageBuilder",
               "Release",
               "Sign"
             ]
           }
         },
+        "VendorDescription": {
+          "type": "string"
+        },
+        "VendorId": {
+          "type": "string"
+        },
         "Verbosity": {
           "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",

diff --git a/Build/Build.cs b/Build/Build.cs
@@ -4,8 +4,11 @@
 using ricaun.Nuke.Components;
 
 [CheckBuildProjectConfigurations]
-class Build : NukeBuild, IPublishPack, ICompileExample
+class Build : NukeBuild, IPublishPack, ICompileExample, IRevitPackageBuilder
 {
-    // string IHazExample.Folder => "Release";
+    string IHazPackageBuilderProject.Name => this.From<IHazExample>().Name;
+    string IHazRevitPackageBuilder.Application => "Revit.App";
+    bool IHazRevitPackageBuilder.NewVersions => true;
+    bool IHazExample.ReleaseExample => false;
     public static int Main() => Execute<Build>(x => x.From<IPublishPack>().Build);
 }
diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="ricaun.Nuke" Version="*" />
+    <PackageReference Include="ricaun.Nuke.PackageBuilder" Version="*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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.0.4] / 2022-01-12
+- Add NugetApiUrl & NugetApiKey
+- Update Readme
+- Update Build Project
+
 ## [0.0.3] / 2021-12-21
 - Add TickNumber
 - Remove Package Create on Debug
@@ -37,7 +42,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Add AutodeskExtension
 - First Release
 
-[vNext]: https://github.com/ricaun-io/ricaun.Revit.UI/compare/1.0.0...HEAD
-[0.0.3]: https://github.com/ricaun-io/ricaun.Revit.UI/compare/0.0.2...0.0.3
-[0.0.2]: https://github.com/ricaun-io/ricaun.Revit.UI/compare/0.0.1...0.0.2
-[0.0.1]: https://github.com/ricaun-io/ricaun.Revit.UI/compare/0.0.1
+[vNext]: ../../compare/1.0.0...HEAD
+[0.0.4]: ../../compare/0.0.3...0.0.4
+[0.0.3]: ../../compare/0.0.2...0.0.3
+[0.0.2]: ../../compare/0.0.1...0.0.2
+[0.0.1]: ../../compare/0.0.1
diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
 # ricaun.Revit.UI
 
-[![Publish](https://github.com/ricaun-io/ricaun.Revit.UI/actions/workflows/Publish.yml/badge.svg)](https://github.com/ricaun-io/ricaun.Revit.UI/actions)
-[![Develop](https://github.com/ricaun-io/ricaun.Revit.UI/actions/workflows/Develop.yml/badge.svg)](https://github.com/ricaun-io/ricaun.Revit.UI/actions)
+[![Publish](../../actions/workflows/Publish.yml/badge.svg)](../../actions)
+[![Develop](../../actions/workflows/Develop.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)
 
 ---
 

diff --git a/ricaun.Revit.UI.Example/ricaun.Revit.UI.Example.csproj b/ricaun.Revit.UI.Example/ricaun.Revit.UI.Example.csproj
@@ -61,7 +61,7 @@
   <!-- Release -->
   <PropertyGroup Condition="!$(Configuration.Contains('Debug'))">
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\$(RevitVersion)</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>Revit$(RevitVersion)</DefineConstants>
     <NoWarn>MSB3052</NoWarn>
     <DebugType>None</DebugType>
@@ -84,34 +84,9 @@
   <PropertyGroup>
     <PackageAssemblyVersion>.$(Version)</PackageAssemblyVersion>
   </PropertyGroup>
-
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <PropertyGroup>
-      <VersionSuffix>5</VersionSuffix>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="AfterBuild" >
-    <PropertyGroup>
-      <VersionSuffix>5</VersionSuffix>
-    </PropertyGroup>
-  </Target>
-
   <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
     <Revision>$([MSBuild]::Divide($([System.DateTime]::get_Now().get_TimeOfDay().get_TotalSeconds()), 4).ToString('F0'))</Revision>
     <Version>$(Version).$(Revision)</Version>
-    <!--
-    
-    <Version>$(Version).$([System.DateTime]::UtcNow.ToString(mmff))</Version>
-    <Deterministic>False</Deterministic>
-    
-      <VersionSuffix>1.0.0.$([System.DateTime]::UtcNow.ToString(mmff))</VersionSuffix>
-  <AssemblyVersion Condition=" '$(VersionSuffix)' == '' ">0.0.0.1</AssemblyVersion>
-  <AssemblyVersion Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</AssemblyVersion>
-  <Version Condition=" '$(VersionSuffix)' == '' ">0.0.1.0</Version>
-  <Version Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)</Version>
-    
-    -->
     <PackageAssemblyVersion>.Dev.$(Version)</PackageAssemblyVersion>
   </PropertyGroup>
 

diff --git a/ricaun.Revit.UI/ricaun.Revit.UI.csproj b/ricaun.Revit.UI/ricaun.Revit.UI.csproj
@@ -61,7 +61,7 @@
   <!-- Release -->
   <PropertyGroup Condition="!$(Configuration.Contains('Debug'))">
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\$(RevitVersion)</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>Revit$(RevitVersion)</DefineConstants>
     <NoWarn>MSB3052</NoWarn>
     <DebugType>None</DebugType>
@@ -77,7 +77,7 @@
 
   <PropertyGroup>
     <PackageId>ricaun.Revit.UI</PackageId>
-    <Version>0.0.3</Version>
+    <Version>0.0.4</Version>
     <ProjectGuid>{2064ba4d-5527-41e9-8b76-0cbfefa35900}</ProjectGuid>
   </PropertyGroup>