Prepare to publish

Author: sprucely

Htmx.Components.csproj

@@ -37,6 +37,7 @@
     <None Include="README.md" Pack="true" PackagePath="\" />
     <None Include="LICENSE" Pack="true" PackagePath="\" />
     <None Include="docs/images/logo.png" Pack="true" PackagePath="logo.png" />
+    <None Include="content/css-extractor-patterns.txt" Pack="true" PackagePath="content/css-extractor-patterns.txt" />
   </ItemGroup>
 
   <ItemGroup>
@@ -65,19 +66,9 @@
 
   <!-- CSS Extraction -->
   <ItemGroup>
-    <PackageReference Include="CssExtractor.MSBuild" Version="1.4.0">
+    <PackageReference Include="CssExtractor.MSBuild" Version="1.7.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
-  <PropertyGroup>
-    <!-- Custom patterns for .WithClass(...) and .WithIcon(...) expressions -->
-    <CssExtractorCustomPatterns>
-      \.WithClass\s*\(\s*"([^"]+)"\s*\)
-      ;
-      \.WithIcon\s*\(\s*"([^"]+)"\s*\)
-    </CssExtractorCustomPatterns>
-  </PropertyGroup>
-
 </Project>

azure-pipelines.yml

@@ -10,10 +10,10 @@ variables:
   buildConfiguration: "Release"
   majorVersion: 1
   minorVersion: 0
-  patchVersion: $[counter(variables['minorVersion'], 0)]
+  patchVersion: $[counter(format('{0}.{1}', variables['majorVersion'], variables['minorVersion']), 0)]
   version: $(majorVersion).$(minorVersion).$(patchVersion)
 
-name: $(majorVersion).$(minorVersion).$(patchVersion)
+name: $(version)
 
 steps:
   - task: UseDotNet@2
@@ -22,35 +22,41 @@ steps:
       version: "8.0.x"
 
   - task: DotNetCoreCLI@2
+    displayName: 'Restore packages'
     inputs:
       command: 'restore'
       projects: '$(solution)'
 
   - task: DotNetCoreCLI@2
+    displayName: 'Build solution'
     inputs:
       command: 'build'
       projects: '$(solution)'
-      arguments: '--configuration $(buildConfiguration)'
+      arguments: '--configuration $(buildConfiguration) --no-restore'
+
+  # TODO: Add test execution here
 
   - task: DotNetCoreCLI@2
+    displayName: 'Pack NuGet package'
     inputs:
       command: "pack"
       packagesToPack: "Htmx.Components.csproj"
       versioningScheme: "byBuildNumber"
       configuration: "$(buildConfiguration)"
 
   - task: PublishBuildArtifacts@1
+    displayName: 'Publish artifacts'
     inputs:
       PathtoPublish: "$(Build.ArtifactStagingDirectory)"
       ArtifactName: "drop"
       publishLocation: "Container"
 
-  - script: |
-      dotnet nuget push "$(Build.ArtifactStagingDirectory)/**/*.nupkg" \
-        --api-key "$(NUGET_API_KEY)" \
-        --source "https://api.nuget.org/v3/index.json" \
-        --skip-duplicate
+  - task: DotNetCoreCLI@2
+    displayName: 'Push to NuGet.org'
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
-    displayName: 'Push NuGet package to NuGet.org'
+    inputs:
+      command: 'custom'
+      custom: 'nuget'
+      arguments: 'push $(Build.ArtifactStagingDirectory)/**/*.nupkg --api-key $(NUGET_API_KEY) --source https://api.nuget.org/v3/index.json --skip-duplicate'
     env:
-      NUGET_API_KEY: $(NUGET_API_KEY)
+      NUGET_API_KEY: $(NuGetApiKey)

content/css-extractor-patterns.txt

@@ -0,0 +1,2 @@
+\.WithClass\s*\(\s*"([^"]+)"\s*\)
+\.WithIcon\s*\(\s*"([^"]+)"\s*\)