proper publishing and source link for all items

specklesystems · Jun 26, 2024 · d26404e · d26404e
1 parent 1f53d60
commit d26404e
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 48 deletions.
diff --git a/Build/packages.lock.json b/Build/packages.lock.json
@@ -14,6 +14,22 @@
         "resolved": "1.1.9",
         "contentHash": "AfK5+ECWYTP7G3AAdnU8IfVj+QpGjrh9GC2mpdcJzCvtQ4pnerAGwHsxJ9D4/RnhDUz2DSzd951O/lQjQby2Sw=="
       },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "MinVer": {
+        "type": "Direct",
+        "requested": "[5.0.0, )",
+        "resolved": "5.0.0",
+        "contentHash": "ybkgpQMtt0Fo91l5rYtE3TZtD+Nmy5Ko091xvfXXOosQdMi30XO2EZ2+ShZt89gdu7RMmJqZaJ+e1q6d+6+KNw=="
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -25,6 +41,16 @@
         "requested": "[12.0.0, )",
         "resolved": "12.0.0",
         "contentHash": "ptxlWtxC8vM6Y6e3h9ZTxBBkOWnWrm/Sa1HT+2i1xcXY3Hx2hmKDZP5RShPf8Xr9D+ivlrXNy57ktzyH8kyt+Q=="
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       }
     }
   }

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,12 +19,20 @@
     <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <PropertyGroup>
-    <MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
+    <MinVerDefaultPreReleaseIdentifiers>preview</MinVerDefaultPreReleaseIdentifiers>
   </PropertyGroup>  
   <ItemGroup>
-    <PackageReference Include="PolySharp" PrivateAssets="All"/>
+    <None Include="..\..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,19 +1,20 @@
 <Project>
   <ItemGroup>
+    <PackageVersion Include="altcover" Version="8.8.74" />
     <PackageVersion Include="Bullseye" Version="5.0.0" />
     <PackageVersion Include="Glob" Version="1.1.9" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="SimpleExec" Version="12.0.0" />
     <PackageVersion Include="Speckle.ProxyGenerator" Version="0.1.11" />
     <PackageVersion Include="Mapster" Version="7.3.0" />
-    <PackageVersion Include="MinVer" Version="5.0.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="Moq" Version="4.20.70" />
     <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.2.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="PolySharp" Version="1.14.1" />
+    <GlobalPackageReference Include="PolySharp" Version="1.14.1" />
+    <GlobalPackageReference Include="MinVer" Version="5.0.0" />
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Revit/Directory.Build.props b/Revit/Directory.Build.props
diff --git a/Revit/Revit2023/Speckle.Revit2023.Api/Speckle.Revit2023.Api.csproj b/Revit/Revit2023/Speckle.Revit2023.Api/Speckle.Revit2023.Api.csproj
@@ -7,10 +7,8 @@
   <Import Project="..\..\Speckle.Revit.Api\Speckle.Revit.Api.projitems" Label="Shared" />
   <ItemGroup>
     <PackageReference Include="Speckle.Revit.API" />
-    <PackageReference Include="Mapster"  />    
+    <PackageReference Include="Mapster"  />
     <PackageReference Include="Speckle.ProxyGenerator" PrivateAssets="All"/>
-    <PackageReference Include="MinVer" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Speckle.Revit2023.Interfaces\Speckle.Revit2023.Interfaces.csproj" />

diff --git a/Revit/Revit2023/Speckle.Revit2023.Interfaces/Speckle.Revit2023.Interfaces.csproj b/Revit/Revit2023/Speckle.Revit2023.Interfaces/Speckle.Revit2023.Interfaces.csproj
@@ -4,8 +4,4 @@
   </PropertyGroup>
   <Import Project="..\..\Speckle.Revit.Interfaces\Speckle.Revit.Interfaces.projitems" Label="Shared" />
   <Import Project="..\..\..\Speckle.Shared\Speckle.Shared.projitems" Label="Shared" />
-  <ItemGroup>
-    <PackageReference Include="MinVer" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/Revit/Revit2024/Speckle.Revit2024.Api/Speckle.Revit2024.Api.csproj b/Revit/Revit2024/Speckle.Revit2024.Api/Speckle.Revit2024.Api.csproj
@@ -9,8 +9,6 @@
     <PackageReference Include="Speckle.Revit.API" />
     <PackageReference Include="Mapster"  />
     <PackageReference Include="Speckle.ProxyGenerator" PrivateAssets="All"/>
-    <PackageReference Include="MinVer" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Speckle.Revit2024.Interfaces\Speckle.Revit2024.Interfaces.csproj" />

diff --git a/Revit/Revit2024/Speckle.Revit2024.Interfaces/Speckle.Revit2024.Interfaces.csproj b/Revit/Revit2024/Speckle.Revit2024.Interfaces/Speckle.Revit2024.Interfaces.csproj
@@ -4,8 +4,4 @@
   </PropertyGroup>
   <Import Project="..\..\Speckle.Revit.Interfaces\Speckle.Revit.Interfaces.projitems" Label="Shared" />
   <Import Project="..\..\..\Speckle.Shared\Speckle.Shared.projitems" Label="Shared" />
-  <ItemGroup>
-    <PackageReference Include="MinVer" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/Rhino/7/Speckle.Rhino7.Api/Speckle.Rhino7.Api.csproj b/Rhino/7/Speckle.Rhino7.Api/Speckle.Rhino7.Api.csproj
@@ -9,8 +9,6 @@
     <PackageReference Include="RhinoWindows"  />
     <PackageReference Include="Mapster"  />
     <PackageReference Include="Speckle.ProxyGenerator" PrivateAssets="All"/>
-    <PackageReference Include="MinVer" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Speckle.Rhino7.Interfaces\Speckle.Rhino7.Interfaces.csproj" />

diff --git a/Rhino/7/Speckle.Rhino7.Interfaces/Speckle.Rhino7.Interfaces.csproj b/Rhino/7/Speckle.Rhino7.Interfaces/Speckle.Rhino7.Interfaces.csproj
@@ -4,8 +4,4 @@
   </PropertyGroup>
   <Import Project="..\..\Speckle.Rhino.Interfaces\Speckle.Rhino.Interfaces.projitems" Label="Shared" />
   <Import Project="..\..\..\Speckle.Shared\Speckle.Shared.projitems" Label="Shared" />
-  <ItemGroup>
-    <PackageReference Include="MinVer" PrivateAssets="All"/>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/Speckle.Host.Apis.sln b/Speckle.Host.Apis.sln
@@ -1,9 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Revit", "Revit", "{8F540B7F-7548-46E9-BDEC-4DAB99367908}"
-	ProjectSection(SolutionItems) = preProject
-		Revit\Directory.Build.props = Revit\Directory.Build.props
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{7A91F6BF-EA8A-428E-BB97-B6C448C247EF}"
 	ProjectSection(SolutionItems) = preProject
@@ -49,9 +46,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1A746BD2-E68A-4877-9922-3549F6C00EDF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rhino", "Rhino", "{72DEFF6C-31DE-4050-8692-AEE8224E9925}"
-	ProjectSection(SolutionItems) = preProject
-		Revit\Directory.Build.props = Revit\Directory.Build.props
-	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "7", "7", "{BC12C4CA-7065-4B76-9787-E8DA4745AD4E}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/Speckle.Tests/Speckle.Tests.csproj b/Speckle.Tests/Speckle.Tests.csproj
@@ -5,6 +5,7 @@
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="altcover" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk"/>
     <PackageReference Include="Moq" />

diff --git a/Speckle.Tests/packages.lock.json b/Speckle.Tests/packages.lock.json
@@ -2,6 +2,12 @@
   "version": 2,
   "dependencies": {
     "net8.0": {
+      "altcover": {
+        "type": "Direct",
+        "requested": "[8.8.74, )",
+        "resolved": "8.8.74",
+        "contentHash": "e8RZNE0vZnuBk/gOAWu9K5wm3S7dOrOlZje3PHI9PJUHqvP1cxVJD1eXAAmddFVlixowB7C7/zvC16GnunC2LQ=="
+      },
       "coverlet.collector": {
         "type": "Direct",
         "requested": "[6.0.2, )",
@@ -27,6 +33,22 @@
           "Microsoft.TestPlatform.TestHost": "17.10.0"
         }
       },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "MinVer": {
+        "type": "Direct",
+        "requested": "[5.0.0, )",
+        "resolved": "5.0.0",
+        "contentHash": "ybkgpQMtt0Fo91l5rYtE3TZtD+Nmy5Ko091xvfXXOosQdMi30XO2EZ2+ShZt89gdu7RMmJqZaJ+e1q6d+6+KNw=="
+      },
       "Moq": {
         "type": "Direct",
         "requested": "[4.20.70, )",
@@ -68,11 +90,21 @@
           "System.Diagnostics.EventLog": "6.0.0"
         }
       },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
       "Microsoft.CodeCoverage": {
         "type": "Transitive",
         "resolved": "17.10.0",
         "contentHash": "yC7oSlnR54XO5kOuHlVOKtxomNNN1BWXX8lK1G2jaPXT9sUok7kCOoA4Pgs0qyFaCtMrNsprztYMeoEGqCm4uA=="
       },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      },
       "Microsoft.TestPlatform.ObjectModel": {
         "type": "Transitive",
         "resolved": "17.10.0",
@@ -117,9 +149,6 @@
         "type": "Transitive",
         "resolved": "4.4.0",
         "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
-      },
-      "speckle.revit2023.interfaces": {
-        "type": "Project"
       }
     }
   }