Merge pull request #3 from snovak7/main

CI improvements
escendit · May 13, 2023 · 95ed444 · 95ed444
2 parents 322945b + 7d59c70
commit 95ed444
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,11 +21,13 @@ jobs:
       - name: Build .NET Solution
         run: dotnet build --configuration Release --no-restore
       - name: Pack .NET Solution
-        run: dotnet pack --no-build --output pack/
+        run: dotnet pack --configuration Release --no-build --output pack/
       - name: Publish .NET Solution to GitHub Packages
         continue-on-error: true
         run: dotnet nuget push pack/* --api-key ${{ secrets.GITHUB_TOKEN }} --source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
       - name: Publish .NET Solution to NuGet.org
-        continue-on-error: true
+        env:
+          apikey: ${{ secrets.NUGET_ORG_KEY }}
+        if: ${{ env.apikey != '' }}
         run: dotnet nuget push pack/* --api-key ${{ secrets.NUGET_ORG_KEY }} --source nuget
-
+        continue-on-error: true
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,4 +4,8 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/escendit/Escendit.Tools.SourceLink.GitHub</RepositoryUrl>
     </PropertyGroup>
+    <!-- Properties for GitHub Actions -->
+    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+        <RepositoryUrl>https://github.com/$(GITHUB_REPOSITORY)</RepositoryUrl>
+    </PropertyGroup>
 </Project>
diff --git a/src/Escendit.Tools.SourceLink.GitHub/Escendit.Tools.SourceLink.GitHub.csproj b/src/Escendit.Tools.SourceLink.GitHub/Escendit.Tools.SourceLink.GitHub.csproj
@@ -11,7 +11,7 @@
         <PackageTags>sourcelink;source;link;github;defaults</PackageTags>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Escendit.Tools.SourceLink.Common" Version="0.1.0-rc.14" />
+        <PackageReference Include="Escendit.Tools.SourceLink.Common" Version="0.4.0" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     </ItemGroup>
     <ItemGroup>

diff --git a/src/Escendit.Tools.SourceLink.GitHub/Escendit.Tools.SourceLink.GitHub.props b/src/Escendit.Tools.SourceLink.GitHub/Escendit.Tools.SourceLink.GitHub.props
@@ -3,6 +3,11 @@
     <PropertyGroup>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+    </PropertyGroup>
+    <!-- Properties for GitHub Actions -->
+    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/$(GITHUB_REPOSITORY)</RepositoryUrl>
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 </Project>