refactor: ♻️ 2.0

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
       - v*
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
         with:
@@ -14,15 +14,17 @@ jobs:
       - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 8.0.x
+      - uses: actions/cache@v3
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
+          restore-keys: ${{ runner.os }}-nuget
       - working-directory: ./src/backend/NSExt
-        run: dotnet build -c Release -f net6.0
+        run: dotnet publish NSExt.csproj -f net8.0-windows -r win-x64 -c Release
       - working-directory: ./src/backend/NSExt
-        run: dotnet build -c Release -f net7.0
+        run: dotnet publish NSExt.csproj -f net8.0 -r linux-x64 -c Release
-      - working-directory: ./src/backend/NSExt
-        run: dotnet build -c Release -f net8.0
-      - working-directory: ./src/backend/NSExt
-        run: dotnet pack -c Release --no-build
       - uses: actions/create-release@v1
+        id: create_release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -30,6 +32,19 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: false
           prerelease: false
-      - id: get_version
+      - uses: actions/upload-release-asset@v1
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
+        env:
-      - run: dotnet nuget push ./dist/backend/NSExt/bin/Release/NSExt.${{ steps.get_version.outputs.VERSION }}.nupkg --skip-duplicate --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./dist/backend/NSExt/bin/Release/net8.0-windows/win-x64/publish/dot.exe
+          asset_name: dot-win-x64.exe
+          asset_content_type: application/octet-stream
+      - uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./dist/backend/NSExt/bin/Release/net8.0/linux-x64/publish/dot
+          asset_name: dot-linux-x64
+          asset_content_type: application/octet-stream

CHANGELOG.md

@@ -1,11 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-### 2.0.4 (2023-12-14)
-
-
-### Features
-
-* ++ ([e41652d](https://github.com/nsnail/NSExt/commit/e41652d553beda7a2eb1600da4795e07f4260330))
-* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04))

Directory.Build.props

@@ -21,7 +21,6 @@
         <Product>NSExt</Product>
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/nsnail/NSExt.git</RepositoryUrl>
-        <RootNamespace>NSExt</RootNamespace>
         <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <Title>$(AssemblyName)</Title>
     </PropertyGroup>

NSExt.sln

@@ -13,14 +13,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
-		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
 		dotnet-tools.json = dotnet-tools.json
 		global.json = global.json
 		key.snk = key.snk
 		LICENSE = LICENSE
 		NSExt.sln.DotSettings = NSExt.sln.DotSettings
-		nuget.config = nuget.config
+		NuGet.Config = NuGet.Config
 		package.json = package.json
 		README.md = README.md
 		README.zh-CN.md = README.zh-CN.md
@@ -57,7 +56,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA
 		code.quality.props = build/code.quality.props
 		copy.pkg.xml.comment.files.targets = build/copy.pkg.xml.comment.files.targets
 		minver.targets = build/minver.targets
-		nuget.package.props = build/nuget.package.props
 		prebuild.targets = build/prebuild.targets
 		stylecop.analyzers.ruleset = build/stylecop.analyzers.ruleset
 	EndProjectSection

build/nuget.package.props

@@ -1,20 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
-        <DelaySign>false</DelaySign>
-        <EmbedAllSources>true</EmbedAllSources>
-        <IncludeSymbols>true</IncludeSymbols>
-        <IsPackable>true</IsPackable>
-        <PackageIcon>logo.png</PackageIcon>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-        <PackageTags>extensions</PackageTags>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <SignAssembly>true</SignAssembly>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    </PropertyGroup>
-    <ItemGroup>
-        <None Include="../../../assets/logo.png" Pack="true" PackagePath="/"/>
-        <None Include="../../../README.md" Pack="true" PackagePath="/"/>
-    </ItemGroup>
-</Project>

dotnet-tools.json

@@ -7,6 +7,24 @@
       "commands": [
         "t4"
       ]
+    },
+    "dotnet-script": {
+      "version": "1.5.0",
+      "commands": [
+        "dotnet-script"
+      ]
+    },
+    "jetbrains.resharper.globaltools": {
+      "version": "2023.3.0",
+      "commands": [
+        "jb"
+      ]
+    },
+    "dnt": {
+      "version": "1.8.3",
+      "commands": [
+        "dnt"
+      ]
     }
   }
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.4",
+  "version": "2.0.1",
   "devDependencies": {
     "cz-git": "^1.7.1",
     "commitizen": "^4.3.0",
@@ -11,4 +11,4 @@
       "path": "node_modules/cz-git"
     }
   }
-}
+}

scripts/code.clean.ps1

@@ -1,4 +1,4 @@
-jb cleanupcode --no-build --include = $( $( git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") } ) -join ";" ) ../NSExt.sln
+dotnet jb cleanupcode --no-build --include = $( $( git status --porcelain | Where-Object { $_ -match "^\s*[MA]" } | ForEach-Object { $_.TrimStart(" M").TrimStart(" A") } ) -join ";" ) ../NSExt.sln
 dot rbom -w -e refs -e .git -e node_modules ../
 dot trim -w -e refs -e .git -e node_modules ../
 dot tolf -w -e refs -e .git -e node_modules ../

scripts/git.pr.ps1

@@ -5,7 +5,7 @@ git add ../
 ../node_modules/.bin/git-cz.ps1
 git pull
 git push --set-upstream origin $branch
-Start-Process -FilePath "https://github.com/nsnail/NSExt/compare/main...$branch"
+Start-Process -FilePath "https://github.com/nsnail/dot/compare/main...$branch"
 Write-Host "按『Enter』重建分支，『Ctrl+C』退出"
 Pause
 ./git.rc.ps1

scripts/resharper.full.ps1

@@ -1 +1 @@
-jb cleanupcode --no-build ../NSExt.sln
+dotnet jb cleanupcode --no-build ../NSExt.sln

src/backend/NSExt/NSExt.csproj

@@ -1,15 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
+        <AssemblyOriginatorKeyFile>../../../key.snk</AssemblyOriginatorKeyFile>
+        <DelaySign>false</DelaySign>
+        <EmbedAllSources>true</EmbedAllSources>
+        <EmbedUntrackedSource>true</EmbedUntrackedSource>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <IncludeSymbols>true</IncludeSymbols>
+        <IsPackable>true</IsPackable>
+        <PackageIcon>logo.png</PackageIcon>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageProjectUrl>https://github.com/nsnail/NSExt.git</PackageProjectUrl>
+        <PackageTags>extensions</PackageTags>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <RootNamespace>NSExt</RootNamespace>
+        <SignAssembly>true</SignAssembly>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
     <Import Project="$(SolutionDir)/build/code.quality.props"/>
-    <Import Project="$(SolutionDir)/build/nuget.package.props"/>
     <Import Project="$(SolutionDir)/build/copy.pkg.xml.comment.files.targets"/>
     <Import Project="$(SolutionDir)/build/prebuild.targets"/>
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
     </ItemGroup>
     <ItemGroup>
+        <None Include="../../../assets/logo.png" Pack="true" PackagePath=""/>
         <None Update="*.json">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>