Add IKVM.MSBuild stuff globally.

ikvmnet · Feb 3, 2023 · 09cf573 · 09cf573
1 parent 710e283
commit 09cf573
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -30,4 +30,11 @@
         <PackageVersion Condition=" '$(PackageVersion)' == '' ">$(Version)</PackageVersion>
     </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.27">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
 </Project>
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -6,5 +6,8 @@ branches:
     regex: ^dev(elop)?(ment)?$
     tag: develop
   release:
-    regex: ^releases?[/-]
+    regex: ^release?[/-]
+    tag: prerelease
+  hotfix:
+    regex: ^hotfix?[/-]
     tag: prerelease
diff --git a/src/IKVM.Maven.Sdk.Tasks.Tests/IKVM.Maven.Sdk.Tasks.Tests.csproj b/src/IKVM.Maven.Sdk.Tasks.Tests/IKVM.Maven.Sdk.Tasks.Tests.csproj
@@ -5,10 +5,6 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.8.0" />
-        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.27">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="Microsoft.CodeCoverage" Version="17.2.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="Moq" Version="4.18.4" />

diff --git a/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj b/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj
@@ -18,10 +18,6 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.8.0" />
         <PackageReference Include="Buildalyzer" Version="4.1.4" />
-        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.27">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="Microsoft.CodeCoverage" Version="17.2.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="Moq" Version="4.18.4" />

diff --git a/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj b/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj
@@ -19,10 +19,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.27">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
         <PackageReference Include="IKVM" Version="8.4.4" />
         <PackageReference Include="IKVM.MSBuild" Version="8.4.4" />