Skip to content

Commit 3ebcf80

Browse files
authored
Use .NET SDK sourcelink integration (#5764)
* Use .NET SDK source link integration Fixes NuGet/Home#13410 Also set a required minimum version of the .NET SDK so that we can be sure that the sourcelink feature is available. Building with a newer SDK is of course still possible. * Update global.json
1 parent 2669e37 commit 3ebcf80

3 files changed

Lines changed: 2 additions & 13 deletions

File tree

Directory.Packages.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
</ItemGroup>
138138

139139
<ItemGroup>
140-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" Condition="'$(Shipping)' == 'true' AND '$(IsXPlat)' != 'true'" />
141140
<GlobalPackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" version="1.0.0" Condition=" '$(DotNetBuildSourceOnly)' != 'true' " />
142141
</ItemGroup>
143142

@@ -183,8 +182,6 @@
183182
<_allowBuildFromSourcePackage Include="Microsoft.Extensions.CommandLineUtils.Sources" />
184183
<_allowBuildFromSourcePackage Include="Microsoft.Extensions.FileProviders.Abstractions" />
185184
<_allowBuildFromSourcePackage Include="Microsoft.Extensions.FileSystemGlobbing" />
186-
<_allowBuildFromSourcePackage Include="Microsoft.SourceLink.AzureRepos.Git" />
187-
<_allowBuildFromSourcePackage Include="Microsoft.SourceLink.GitHub" />
188185
<_allowBuildFromSourcePackage Include="Microsoft.Web.Xdt" />
189186
<_allowBuildFromSourcePackage Include="Newtonsoft.Json" />
190187
<_allowBuildFromSourcePackage Include="System.CommandLine" />

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host*/*" />
4646
<UsagePattern IdentityGlob="Microsoft.NETCore.Platforms/*" />
4747
<UsagePattern IdentityGlob="Microsoft.NETCore.Targets/*" />
48-
<UsagePattern IdentityGlob="Microsoft.SourceLink.AzureRepos.Git/*2" />
49-
<UsagePattern IdentityGlob="Microsoft.SourceLink.Common/*" />
50-
<UsagePattern IdentityGlob="Microsoft.SourceLink.GitHub/*" />
5148
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/*" />
5249
<UsagePattern IdentityGlob="Microsoft.Web.Xdt/*" />
5350
<UsagePattern IdentityGlob="Microsoft.Win32.Registry/*" />

global.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
{
2-
// This empty file has no effect and is here to support Arcade-powered dotnet-build.
3-
// The Arcade build process requires a global.json at the root of the repo and normally
4-
// uses it to restore the necessary SDK and tools to build the repo.
5-
// However, NuGet explitcly wants to use the ambient SDK (normally latest), not any particular
6-
// version. We also don't want to introduce MS.DN.Arcade.SDK into the non-dotnet-build build.
7-
// eng/dotnet-build/global.json has the entry for the Arcade version we need for
8-
// Arcade-powered dotnet-build.
92
"sdk": {
3+
"version": "8.0.100",
4+
"rollForward": "latestMajor",
105
"allowPrerelease": true
116
},
127
"msbuild-sdks": {

0 commit comments

Comments
 (0)