Release 0.3.2 (#50)

josefpihrt · Jun 26, 2022 · ce44451 · ce44451
1 parent be0a058
commit ce44451
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,15 +33,9 @@ jobs:
           semantic_version=$(dotnet-gitversion /showvariable SemVer)
           echo "semantic_version=$semantic_version" >> $GITHUB_ENV
         working-directory: ./
-      - name: Resolve assembly version
-        id: assembly_version
-        run: |
-          assembly_version=$(dotnet-gitversion /showvariable AssemblySemVer)
-          echo "assembly_version=$assembly_version" >> $GITHUB_ENV
-        working-directory: ./
       - run: dotnet restore --configfile nuget.config
       - run: dotnet format --no-restore --verify-no-changes
-      - run: dotnet build --no-restore /p:Version=${{ env.assembly_version }}
+      - run: dotnet build --no-restore /p:Version=${{ env.semantic_version }}
       - run: dotnet test --no-build
       - run: dotnet pack --no-build /p:PackageVersion=${{ env.semantic_version }}
       - uses: actions/upload-artifact@v3
@@ -52,7 +46,7 @@ jobs:
   release_packages:
     runs-on: ubuntu-20.04
     needs: [build_packages]
-    if: github.ref == 'refs/heads/main' && github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
+    if: github.ref_type == 'tag'
     env:
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.2] - 2022-06-26
+
 ### Added
 
 - Add support for Source Link ([#42](https://github.com/josefpihrt/roslynator/pull/42)).

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -2,7 +2,7 @@ build-metadata-padding: 4
 mode: ContinuousDeployment
 
 branches:
-  master:
+  main:
     tag: beta
   pull-request:
     tag: alpha

diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj
@@ -11,7 +11,6 @@
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>orang</ToolCommandName>
     <PackageId>Orang.DotNet.Cli</PackageId>
-    <PackageVersion>0.3.1</PackageVersion>
     <Description>Search, replace, rename and delete directories, files and its content using the power of .NET regular expressions.</Description>
     <PackageProjectUrl>https://github.com/JosefPihrt/Orang</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

diff --git a/src/CommandLine/PackageInfo.cs b/src/CommandLine/PackageInfo.cs
@@ -4,6 +4,6 @@ namespace Orang.CommandLine
 {
     internal static class PackageInfo
     {
-        public const string Version = "0.3.1";
+        public const string Version = "0.3.2";
     }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
 
   <PropertyGroup>
-    <Version>0.3.1.0</Version>
     <LangVersion>10.0</LangVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Orang.snk</AssemblyOriginatorKeyFile>

diff --git a/tools/build.ps1 b/tools/build.ps1
@@ -1,14 +1,5 @@
 #dotnet tool install -g orang.dotnet.cli
 
-$version="0.3.1"
-
-orang replace -e cmd -c "(?<=--version )\d+\.\d+\.\d+(-\w+)?" -r "$version"
-
-orang replace "../src" -e csproj -c "(?<=<PackageVersion>)\d+\.\d+\.\d+(-\w+)?(?=</PackageVersion>)" -r "$version"
-
-orang replace "../src/CommandLine/PackageInfo.cs" -c "(?<="")\d+\.\d+\.\d+(-\w+)?(?="")" -r "$version"
-Write-Host
-
 orang delete "../src" -a d -n "bin|obj" e --content-only -t n -y su s
 Write-Host
 

diff --git a/tools/reinstall_tool.ps1 b/tools/reinstall_tool.ps1
@@ -8,7 +8,7 @@ dotnet pack -c Release --no-build -v normal "../src/CommandLine/CommandLine.cspr
 
 dotnet tool uninstall orang.dotnet.cli -g
 
-dotnet tool install orang.dotnet.cli --version 0.3.1 -g --add-source "../src/CommandLine/bin/Release"
+dotnet tool install orang.dotnet.cli --version 1.0.0 -g --add-source "../src/CommandLine/bin/Release"
 
 Write-Host "DONE"
 Read-Host
diff --git a/tools/reinstall_tool_debug.ps1 b/tools/reinstall_tool_debug.ps1
@@ -6,7 +6,7 @@ dotnet pack -c Debug --no-build -v normal "../src/CommandLine/CommandLine.csproj
 
 dotnet tool uninstall orang.dotnet.cli -g
 
-dotnet tool install orang.dotnet.cli --version 0.3.1 -g --add-source "../src/CommandLine/bin/Debug"
+dotnet tool install orang.dotnet.cli --version 1.0.0 -g --add-source "../src/CommandLine/bin/Debug"
 
 Write-Host "DONE"
 Read-Host