diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 7043ce1..3f74ecb 100644 --- a/.github/workflows/build-test.yaml +++ b/.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 diff --git a/AppCoreNet.Shared.sln b/AppCoreNet.Shared.sln index 2ea2708..5a22238 100644 --- a/AppCoreNet.Shared.sln +++ b/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 diff --git a/Directory.Packages.props b/Directory.Packages.props index f36cbc9..ac4332d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/src/AppCoreNet.Diagnostics.Sources/build/AppCoreNet.Diagnostics.Sources.targets b/src/AppCoreNet.Diagnostics.Sources/build/AppCoreNet.Diagnostics.Sources.targets index 9ec5332..57706a9 100644 --- a/src/AppCoreNet.Diagnostics.Sources/build/AppCoreNet.Diagnostics.Sources.targets +++ b/src/AppCoreNet.Diagnostics.Sources/build/AppCoreNet.Diagnostics.Sources.targets @@ -3,6 +3,9 @@ true + + true + $(DefineConstants);APPCORENET_JETBRAINS_ANNOTATIONS_ENABLED diff --git a/test/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest.csproj b/test/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest.csproj new file mode 100644 index 0000000..d5979d0 --- /dev/null +++ b/test/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest/AppCoreNet.Diagnostics.JetBrains.Annotations.Sources.CompileTest.csproj @@ -0,0 +1,43 @@ + + + + + + + + + net9.0;net8.0 + $(TargetFrameworks);net472 + AppCoreNet.Diagnostics + $(DefineConstants);APPCORENET_SHARED_SOURCES_TESTS + false + false + + + + + + + + + + + + + + + + + \ No newline at end of file