diff --git a/.appveyor.yml b/.appveyor.yml index c6ecc72d29..c9a3506014 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,6 +30,7 @@ dotnet_csproj: package_version: "{version}" artifacts: - path: '**\*.nupkg' + - path: '**\*.snupkg' on_success: - ps: | $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a8cadb666..e4a5fee727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Rename `LogEntry` to `SentryMessage`. Change type of `SentryEvent.Message` from `string` to `SentryMessage`. * Change the type of `Gpu.VendorId` from `int` to `string`. * Add support for envelopes. +* Publishing symbols package (snupkg) to nuget.org with sourcelink # 3.0.0-alpha.0 diff --git a/Sentry.sln b/Sentry.sln index 31747a90f4..eca2ec2ba2 100644 --- a/Sentry.sln +++ b/Sentry.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27705.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sentry", "src\Sentry\Sentry.csproj", "{F2486CC8-FAB7-4775-976F-C5A4CF97867F}" EndProject @@ -27,10 +27,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".root", ".root", "{9D7E2F87 after.Sentry.sln.targets = after.Sentry.sln.targets build.ps1 = build.ps1 build.sh = build.sh + CHANGELOG.md = CHANGELOG.md Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets README.md = README.md - CHANGELOG.md = CHANGELOG.md EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{77454495-55EE-4B40-A089-71B9E8F82E89}" @@ -85,13 +85,32 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sentry.NLog", "src\Sentry.N EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sentry.NLog.Tests", "test\Sentry.NLog.Tests\Sentry.NLog.Tests.csproj", "{21A360C7-338F-4A9D-A9A3-83152D0C9303}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.NLog", "samples\Sentry.Samples.NLog\Sentry.Samples.NLog.csproj", "{DC90D63E-E4F3-40CB-AF6D-2EAEE5F619B7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sentry.Samples.NLog", "samples\Sentry.Samples.NLog\Sentry.Samples.NLog.csproj", "{DC90D63E-E4F3-40CB-AF6D-2EAEE5F619B7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sentry.Samples.AspNetCore3.Mvc", "samples\Sentry.Samples.AspNetCore3.Mvc\Sentry.Samples.AspNetCore3.Mvc.csproj", "{3CCB5D82-1D19-4FDE-B92D-CA726C418171}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.Samples.AspNetCore3.Mvc", "samples\Sentry.Samples.AspNetCore3.Mvc\Sentry.Samples.AspNetCore3.Mvc.csproj", "{3CCB5D82-1D19-4FDE-B92D-CA726C418171}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sentry.AspNet", "src\Sentry.AspNet\Sentry.AspNet.csproj", "{22AA261A-F8B4-41E2-95DD-82632EED0AA5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.AspNet", "src\Sentry.AspNet\Sentry.AspNet.csproj", "{22AA261A-F8B4-41E2-95DD-82632EED0AA5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sentry.AspNet.Tests", "test\Sentry.AspNet.Tests\Sentry.AspNet.Tests.csproj", "{0885DDFE-2FC7-4241-AEB1-8D6BDA627C0A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{3454831A-397C-4039-AAFC-9152A4E0B682}" + ProjectSection(SolutionItems) = preProject + scripts\bump-version.sh = scripts\bump-version.sh + scripts\zeus.sh = scripts\zeus.sh + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sentry.AspNet.Tests", "test\Sentry.AspNet.Tests\Sentry.AspNet.Tests.csproj", "{0885DDFE-2FC7-4241-AEB1-8D6BDA627C0A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{F267BFB9-C5D5-4018-9D3F-B55443702AEC}" + ProjectSection(SolutionItems) = preProject + .github\CODEOWNERS = .github\CODEOWNERS + .github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md + .github\release-drafter.yml = .github\release-drafter.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{E1800E08-72E6-45AE-91EC-69B4FDBA7555}" + ProjectSection(SolutionItems) = preProject + .github\workflows\build.yaml = .github\workflows\build.yaml + .github\workflows\changelog.yaml = .github\workflows\changelog.yaml + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -239,6 +258,9 @@ Global {3CCB5D82-1D19-4FDE-B92D-CA726C418171} = {77454495-55EE-4B40-A089-71B9E8F82E89} {22AA261A-F8B4-41E2-95DD-82632EED0AA5} = {AF6AF4C7-8AA2-4D59-8064-2D79560904EB} {0885DDFE-2FC7-4241-AEB1-8D6BDA627C0A} = {83263231-1A2A-4733-B759-EEFF14E8C5D5} + {3454831A-397C-4039-AAFC-9152A4E0B682} = {9D7E2F87-D6F4-4BBB-8980-87D0A8344C74} + {F267BFB9-C5D5-4018-9D3F-B55443702AEC} = {9D7E2F87-D6F4-4BBB-8980-87D0A8344C74} + {E1800E08-72E6-45AE-91EC-69B4FDBA7555} = {F267BFB9-C5D5-4018-9D3F-B55443702AEC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0C652B1A-DF72-4EE5-A98B-194FE2C054F6} diff --git a/build.ps1 b/build.ps1 index ab47479a81..a54485d665 100644 --- a/build.ps1 +++ b/build.ps1 @@ -8,5 +8,5 @@ dotnet test -c Release -l $testLogger ` /p:Exclude='"""[Sentry.Protocol.Test*]*,[xunit.*]*,[Sentry.Test*]*\"""' if ($LASTEXITCODE -ne 0) { exit 1 } -dotnet pack -c Release --no-build +dotnet pack -c Release --no-build /p:ContinuousIntegrationBuild=true if ($LASTEXITCODE -ne 0) { exit 1 } diff --git a/scripts/zeus.sh b/scripts/zeus.sh index b939de5fa8..845e9083ac 100644 --- a/scripts/zeus.sh +++ b/scripts/zeus.sh @@ -7,6 +7,7 @@ export PATH=./node_modules/.bin:$PATH upload_artifacts() { zeus upload -t "application/zip+nupkg" ./src/*/bin/Release/*.nupkg + zeus upload -t "application/zip+snupkg" ./src/*/bin/Release/*.snupkg zeus job update --status=passed } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0267263d1c..22f4440535 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,12 +22,19 @@ sentry-nuget.png https://sentry.io MIT - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb Can be found at: https://github.com/getsentry/sentry-dotnet/releases + + true + + true + + true + snupkg false + annotations