fix packages issues

Ad-Hoc-org · Nov 16, 2024 · b08fd7c · b08fd7c
1 parent 61fe463
commit b08fd7c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -73,4 +73,4 @@ jobs:
       id: tests
       run: |
         find . -name "*.csproj" | xargs -I {} dotnet test "{}" \
-          --framework ${{ matrix.framework }} \
+          --framework ${{ matrix.framework }}
diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -34,7 +34,9 @@ jobs:
           dotnet-version: '9.0.x'
 
       - name: Pack the project
-        run: find -type f -name "$PACKAGE.csproj" | xargs -I {} dotnet pack "{}" --configuration Release --output ./nupkgs
+        run: find -type f -name "$PACKAGE.csproj" | xargs -I {}  \
+                dotnet pack "{}" --configuration Release --output ./nupkgs \
+                  /p:RepositoryUrl=https://github.com/${{ github.repository }}
 
       - name: Validate package version
         run: |

diff --git a/AdHoc.Locking.slnx b/AdHoc.Locking.slnx
@@ -15,13 +15,8 @@
   <Project Path="src\AdHoc.Locking.Abstraction\AdHoc.Locking.Abstraction.csproj" />
   <Project Path="src\AdHoc.Locking.Extensions.DependencyInjection\AdHoc.Locking.Extensions.DependencyInjection.csproj" />
   <Project Path="src\AdHoc.Locking\AdHoc.Locking.csproj" />
-  <Project Path="test\AdHoc.Locking.Test\AdHoc.Locking.Test.csproj" />
   <Folder Name="/test/">
-    <Project Path="..\..\..\..\..\..\..\..\AdHoc\AdHoc.Locking\test\AdHoc.Locking.AtomicFileLock\AdHoc.Locking.AtomicFileLock.csproj" />
-    <Project Path="..\..\..\..\..\..\..\..\AdHoc\AdHoc.Locking\test\AdHoc.Locking.Test\AdHoc.Locking.Test.csproj" />
+	<Project Path="test\AdHoc.Locking.Test\AdHoc.Locking.Test.csproj" />
     <Project Path="test\AdHoc.Locking.AtomicFileLock\AdHoc.Locking.AtomicFileLock.csproj" />
   </Folder>
-  <Project Path="..\..\..\..\..\..\..\..\AdHoc\AdHoc.Locking\src\AdHoc.Locking.Abstraction\AdHoc.Locking.Abstraction.csproj" />
-  <Project Path="..\..\..\..\..\..\..\..\AdHoc\AdHoc.Locking\src\AdHoc.Locking.Extensions.DependencyInjection\AdHoc.Locking.Extensions.DependencyInjection.csproj" />
-  <Project Path="..\..\..\..\..\..\..\..\AdHoc\AdHoc.Locking\src\AdHoc.Locking\AdHoc.Locking.csproj" />
 </Solution>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,9 +14,9 @@
 
   <PropertyGroup Label="PackageProperties">
     <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/Ad-Hoc-org/.dotnet</RepositoryUrl>
+    <RepositoryUrl>https://github.com/Ad-Hoc-org/AdHoc.Locking</RepositoryUrl>
     <PackageTags>AdHoc</PackageTags>
-    <!-- <PackageIcon>icon-512.png</PackageIcon> -->
+    <PackageIcon>icon-512.png</PackageIcon>
     <Authors>AdHoc Authors</Authors>
     <Company>AdHoc</Company>
     <Copyright>Copyright AdHoc Authors</Copyright>
@@ -31,9 +31,9 @@
     <!-- <PackageReleaseNotesFile>$(RepoRoot)RELEASENOTES.md</PackageReleaseNotesFile> -->
   </PropertyGroup>
   <ItemGroup>
-	<!-- <None Include="$(RepoRoot)icon-512.png" Pack="true" PackagePath="\" /> -->
+    <!-- <None Include="$(RepoRoot)icon-512.png" Pack="true" PackagePath="\" /> -->
   </ItemGroup>
-  
+
   <!-- Enable sourcelink https://docs.microsoft.com/dotnet/standard/library-guidance/sourcelink -->
   <PropertyGroup Label="SourceLinkProperties">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -57,13 +57,13 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
   </PropertyGroup>
-  
+
   <PropertyGroup Label="Fody">
     <WeaverConfiguration>
       <Weavers GenerateXsd="false">
         <ConfigureAwait ContinueOnCapturedContext="false" />
       </Weavers>
     </WeaverConfiguration>
   </PropertyGroup>
-  
+
 </Project>