Merge branch 'v8/main' of https://github.com/Method4Ltd/Method4.Umbra…

…coMigrator.Source into v8/main

.github/workflows/v8-main-pre-release.yml

@@ -3,7 +3,7 @@ name: v8 Main - Pre-release
 on:
   push:
     tags:
-    - "v8.[0-9]+.[0-9]+-[a-z]*[0-9][0-9][0-9]"
+    - "v8.[0-9]+.[0-9]+-[a-z]*[0-9]+"
 
 jobs:
   build:
@@ -14,26 +14,31 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set VERSION variable from tag
-      run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
+      run: |
+        git fetch --tags
+        $tag = git describe --tags --abbrev=0
+        if ($tag.StartsWith("v")) {
+          $cleanTag = $tag.Substring(1)
+        } else {
+          $cleanTag = $tag
+        }
+        echo "VERSION=$cleanTag" >> $env:GITHUB_ENV
 
-    - name: Setup NuGet
-      uses: NuGet/setup-nuget@v2
-
-    - name: Restore Packages
-      run: nuget restore src/Method4.UmbracoMigrator.Source.sln
+    - name: Show VERSION
+      run: echo "VERSION is $env:VERSION"
 
     - name: Pack Core Project
-      run: dotnet pack src/Method4.UmbracoMigrator.Source.Core/Method4.UmbracoMigrator.Source.Core.csproj --configuration Release /p:Version=${VERSION} --output .
+      run: dotnet pack src/Method4.UmbracoMigrator.Source.Core/Method4.UmbracoMigrator.Source.Core.csproj -p:PackageVersion=$env:VERSION --configuration Release --output .
 
     - name: Pack Main Project
-      run: dotnet pack src/Method4.UmbracoMigrator.Source/Method4.UmbracoMigrator.Source.csproj --configuration Release /p:Version=${VERSION} --output .
+      run: dotnet pack src/Method4.UmbracoMigrator.Source/Method4.UmbracoMigrator.Source.csproj -p:PackageVersion=$env:VERSION --configuration Release --output .
 
     - name: Push Core Project
-      run: dotnet nuget push Method4.UmbracoMigrator.Source.Core.${VERSION}.nupkg --api-key ${NUGET_API_KEY} --source https://api.nuget.org/v3/index.json
+      run: dotnet nuget push Method4.UmbracoMigrator.Source.Core.$env:VERSION.nupkg --api-key $env:NUGET_API_KEY --source https://api.nuget.org/v3/index.json
       env:
         NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
 
     - name: Push Main Project
-      run: dotnet nuget push Method4.UmbracoMigrator.Source.${VERSION}.nupkg --api-key ${NUGET_API_KEY} --source https://api.nuget.org/v3/index.json
+      run: dotnet nuget push Method4.UmbracoMigrator.Source.$env:VERSION.nupkg --api-key $env:NUGET_API_KEY --source https://api.nuget.org/v3/index.json
       env:
         NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

README.md

@@ -11,9 +11,7 @@ The Method4 Umbraco Migrator allows migrating content and media from an Umbraco
 
 This tool was originally created as an internal tool for us at Method4, to make migrating our client's Umbraco sites easy, and we've decided to make it available as an open-source package; as we believe other devs in the Umbraco community may find it useful too.
 
-Read our blog post about this tool here: [TODO Insert Link]
-
-The migrator tool consists of 2 packages, _Method4.UmbracoMigrator.Source_ and _Method4.UmbracoMigrator.Target_.
+The migrator tool consists of 2 packages:
 
 ### 📤 [Method4.UmbracoMigrator.Source](https://github.com/Method4Ltd/Method4.UmbracoMigrator.Source)
 Generates the Migration Snapshot (.zip) files that will be imported into your new Umbraco v10+ site using the Target package.

src/Method4.UmbracoMigrator.Source/Method4.UmbracoMigrator.Source.csproj

@@ -9,7 +9,7 @@
 		<Title>Method4.UmbracoMigrator.Source</Title>
 		<Description>Generate migration snapshots from an Umbraco 8 site</Description>
 		<Product>Method4.UmbracoMigrator.Source</Product>
-		<PackageTags>umbraco plugin package content migration</PackageTags>
+		<PackageTags>umbraco plugin package umbraco-marketplace content migration</PackageTags>
 		<Authors>Method4 Ltd</Authors>
 		<Company>Method4 Ltd</Company>
 		<Copyright>Method4 ©️ 2024</Copyright>
@@ -54,4 +54,4 @@
 		<None Include="../../NUGET_README.txt" Pack="true" PackagePath="\" />
 		<None Include="../../NUGET_README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
-</Project>
+</Project>