Merge pull request #67 from AppCoreNet/feat/jetbrains-sources

Added support for Jetbrains.Annotations.Sources

Author: prochnowc

.github/workflows/build-test.yaml

@@ -80,7 +80,7 @@ jobs:
           name: artifacts
           path: ./artifacts
       - name: Push packages
-        run: dotnet nuget push -s ${{vars.MYGET_URL}} -k ${{secrets.MYGET_API_KEY}} ./artifacts/*.nupkg
+        run: dotnet nuget push --skip-duplicate -s ${{vars.MYGET_URL}} -k ${{secrets.MYGET_API_KEY}} ./artifacts/*.nupkg
 
   deploy-release:
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
@@ -103,4 +103,4 @@ jobs:
           name: artifacts
           path: ./artifacts
       - name: Push packages
-        run: dotnet nuget push -s ${{vars.NUGET_URL}} -k ${{secrets.NUGET_API_KEY}} ./artifacts/*.nupkg
+        run: dotnet nuget push --skip-duplicate -s ${{vars.NUGET_URL}} -k ${{secrets.NUGET_API_KEY}} ./artifacts/*.nupkg

AppCoreNet.Shared.sln

@@ -48,6 +48,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppCoreNet.Diagnostics.JetB
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppCoreNet.Attributes.CompileTest", "test\AppCoreNet.Attributes.CompileTest\AppCoreNet.Attributes.CompileTest.csproj", "{018383FB-2DAF-4966-BD14-5CEB84A04D58}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest", "test\AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest\AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest.csproj", "{26E49BBB-D15B-47AF-B46C-B4B6F4289375}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -90,6 +92,10 @@ Global
 		{018383FB-2DAF-4966-BD14-5CEB84A04D58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{018383FB-2DAF-4966-BD14-5CEB84A04D58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{018383FB-2DAF-4966-BD14-5CEB84A04D58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26E49BBB-D15B-47AF-B46C-B4B6F4289375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26E49BBB-D15B-47AF-B46C-B4B6F4289375}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26E49BBB-D15B-47AF-B46C-B4B6F4289375}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26E49BBB-D15B-47AF-B46C-B4B6F4289375}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -107,5 +113,6 @@ Global
 		{46E81671-864B-4A8F-B94F-A2FCB1AC0DE6} = {953534A6-E8BA-4409-BF0D-F7BF27819118}
 		{53117AEF-4E23-48E3-BF3B-4E5398E384F9} = {953534A6-E8BA-4409-BF0D-F7BF27819118}
 		{018383FB-2DAF-4966-BD14-5CEB84A04D58} = {953534A6-E8BA-4409-BF0D-F7BF27819118}
+		{26E49BBB-D15B-47AF-B46C-B4B6F4289375} = {953534A6-E8BA-4409-BF0D-F7BF27819118}
 	EndGlobalSection
 EndGlobal

Directory.Packages.props

@@ -21,5 +21,6 @@
     <PackageVersion Include="Nullable" Version="1.3.1" />
     <PackageVersion Include="Polyfill" Version="8.7.3" />
     <PackageVersion Include="JetBrains.Annotations" Version="2025.2.0" />
+    <PackageVersion Include="JetBrains.Annotations.Sources" Version="2025.2.0" />
   </ItemGroup>
 </Project>

src/AppCoreNet.Diagnostics.Sources/build/AppCoreNet.Diagnostics.Sources.targets

@@ -3,6 +3,9 @@
     <PropertyGroup Condition="@(PackageDependencies->WithMetadataValue('Identity', 'JetBrains.Annotations')->Count()) != 0 and '$(AppCoreNetDiagnosticsJetBrainsAnnotationsEnabled)' == ''">
       <AppCoreNetDiagnosticsJetBrainsAnnotationsEnabled>true</AppCoreNetDiagnosticsJetBrainsAnnotationsEnabled>
     </PropertyGroup>
+    <PropertyGroup Condition="@(PackageDependencies->WithMetadataValue('Identity', 'JetBrains.Annotations.Sources')->Count()) != 0 and '$(AppCoreNetDiagnosticsJetBrainsAnnotationsEnabled)' == ''">
+      <AppCoreNetDiagnosticsJetBrainsAnnotationsEnabled>true</AppCoreNetDiagnosticsJetBrainsAnnotationsEnabled>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(AppCoreNetDiagnosticsJetBrainsAnnotationsEnabled)' == 'true'">
       <DefineConstants>$(DefineConstants);APPCORENET_JETBRAINS_ANNOTATIONS_ENABLED</DefineConstants>
     </PropertyGroup>

test/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest.csproj

@@ -0,0 +1,43 @@
+<Project>
+
+  <!--
+   The SDK is imported manually to also inject the build files from AppCoreNet.Attributes.Sources
+   like it's done when referencing via NuGet.
+   -->
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="..\..\src\AppCoreNet.Attributes.Sources\build\AppCoreNet.Attributes.Sources.props" />
+  <Import Project="..\..\src\AppCoreNet.Diagnostics.Sources\build\AppCoreNet.Diagnostics.Sources.props" />
+
+  <PropertyGroup>
+    <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Unix'">$(TargetFrameworks);net472</TargetFrameworks>
+    <RootNamespace>AppCoreNet.Diagnostics</RootNamespace>
+    <DefineConstants>$(DefineConstants);APPCORENET_SHARED_SOURCES_TESTS</DefineConstants>
+    <IsTestProject>false</IsTestProject>
+    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile
+      LinkBase="AppCoreNet.Attributes"
+      Include="..\..\src\AppCoreNet.Attributes.Sources\**\*.cs"
+      Exclude="..\..\src\AppCoreNet.Attributes.Sources\obj\**\*.cs" />
+    <Compile
+      LinkBase="AppCoreNet.Diagnostics"
+      Include="..\..\src\AppCoreNet.Diagnostics.Sources\**\*.cs"
+      Exclude="..\..\src\AppCoreNet.Diagnostics.Sources\obj\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations.Sources" />
+  </ItemGroup>
+
+  <!--
+   The SDK is imported manually to also inject the build files from AppCoreNet.Attributes.Sources
+   like it's done when referencing via NuGet.
+   -->
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <Import Project="..\..\src\AppCoreNet.Attributes.Sources\build\AppCoreNet.Attributes.Sources.targets" />
+  <Import Project="..\..\src\AppCoreNet.Diagnostics.Sources\build\AppCoreNet.Diagnostics.Sources.targets" />
+
+</Project>