diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 3172073..d58c056 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -32,31 +32,14 @@ jobs:
git fetch --prune --unshallow
git submodule -q update --init --recursive
- - name: Fetch Tags for GitVersion
- run: |
- git fetch --tags
-
- - name: Fetch master for GitVersion
- if: github.ref != 'refs/heads/master'
- run: git branch --create-reflog master origin/master
-
- - name: Install GitVersion
- uses: gittools/actions/setup-gitversion@v0.3
- with:
- versionSpec: "5.1.x"
-
- - name: Use GitVersion
- id: gitversion # step id used as reference for output values
- uses: gittools/actions/execute-gitversion@v0.3
-
- name: Setup DotNet SDK
uses: actions/setup-dotnet@v1
with:
- dotnet-version: "3.1.101"
+ dotnet-version: "3.1.x"
- name: Pack
shell: pwsh
- run: ./ci-pack.ps1 "${{steps.gitversion.outputs.nuGetVersion}}"
+ run: ./ci-pack.ps1
- name: Publish to MyGet
shell: pwsh
@@ -104,31 +87,14 @@ jobs:
git fetch --prune --unshallow
git submodule -q update --init --recursive
- - name: Fetch Tags for GitVersion
- run: |
- git fetch --tags
-
- - name: Fetch master for GitVersion
- if: github.ref != 'refs/heads/master'
- run: git branch --create-reflog master origin/master
-
- - name: Install GitVersion
- uses: gittools/actions/setup-gitversion@v0.3
- with:
- versionSpec: "5.1.x"
-
- - name: Use GitVersion
- id: gitversion # step id used as reference for output values
- uses: gittools/actions/execute-gitversion@v0.3
-
- name: Setup DotNet SDK
uses: actions/setup-dotnet@v1
with:
- dotnet-version: "3.1.101"
+ dotnet-version: "3.1.x"
- name: Build
shell: pwsh
- run: ./ci-build.ps1 "${{steps.gitversion.outputs.nuGetVersion}}"
+ run: ./ci-build.ps1
- name: Test
shell: pwsh
diff --git a/Directory.Build.props b/Directory.Build.props
index 43c9225..daf9b7e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -24,7 +24,6 @@
full
disable
true
- false
true
@@ -73,6 +72,12 @@
+
+
+ v
+ normal
+
+
$(MSBuildThisFileDirectory)shared-infrastructure/SixLabors.snk
diff --git a/Directory.Build.targets b/Directory.Build.targets
index ef75743..f30ffc0 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -21,7 +21,10 @@
-
+
+
+
+
diff --git a/GitVersion.yml b/GitVersion.yml
deleted file mode 100644
index f2a251c..0000000
--- a/GitVersion.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-continuous-delivery-fallback-tag: ci
-branches:
- master:
- tag: unstable
- mode: ContinuousDeployment
- pull-request:
- tag: pr
diff --git a/ci-build.ps1 b/ci-build.ps1
index dac713b..b424e09 100644
--- a/ci-build.ps1
+++ b/ci-build.ps1
@@ -1,11 +1,6 @@
-param(
- [Parameter(Mandatory, Position = 0)]
- [string]$version
-)
-
dotnet clean -c Release
$repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
# Building for packing and publishing.
-dotnet build -c Release /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
+dotnet build -c Release /p:RepositoryUrl=$repositoryUrl
diff --git a/ci-pack.ps1 b/ci-pack.ps1
index a4e846d..09f4534 100644
--- a/ci-pack.ps1
+++ b/ci-pack.ps1
@@ -1,11 +1,6 @@
-param(
- [Parameter(Mandatory, Position = 0)]
- [string]$version
-)
-
dotnet clean -c Release
$repositoryUrl = "https://github.com/$env:GITHUB_REPOSITORY"
# Building for packing and publishing.
-dotnet pack -c Release --output "$PSScriptRoot/artifacts" /p:packageversion=$version /p:RepositoryUrl=$repositoryUrl
+dotnet pack -c Release --output "$PSScriptRoot/artifacts" /p:RepositoryUrl=$repositoryUrl
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7416ad9..cde3a89 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -26,6 +26,19 @@
true
+
+
+ true
+ true
+
+
+
+ true
+
+ true
+ snupkg
+
+
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index c0e01ae..d7bfa7d 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -20,6 +20,18 @@
$(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension)
+
+
+
+
+ <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
+
+
+
+
false
diff --git a/src/SixLabors.Fonts/SixLabors.Fonts.csproj b/src/SixLabors.Fonts/SixLabors.Fonts.csproj
index a6595e3..36f48e6 100644
--- a/src/SixLabors.Fonts/SixLabors.Fonts.csproj
+++ b/src/SixLabors.Fonts/SixLabors.Fonts.csproj
@@ -22,9 +22,11 @@
-
+
-
+
+
+
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 2402425..7046091 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -22,11 +22,11 @@
-
+
-
+