Skip to content

Commit 1304f78

Browse files
akoeplingerakoeplinger
authored
Update projects to net8.0 and move to Central Package Management (#123)
1 parent ff7b003 commit 1304f78

22 files changed

+179
-102
lines changed

‎Directory.Packages.props

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="src\SourceBrowser\src\Directory.Packages.props" />
3+
</Project>

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This repo contains the code for building http://source.dot.net
88
This repo uses https://github.com/KirillOsenkov/SourceBrowser (with a few additions here https://github.com/dotnet/SourceBrowser/tree/source-indexer) to index the dotnet sources and produce a navigatable and searchable website containing the full source code. This includes code from the runtime, winforms, wpf, aspnetcore, and msbuild, among others. For a full list see here https://github.com/dotnet/source-indexer/blob/main/src/index/repositories.props.
99

1010
## Build Prerequsites
11-
The build requires .NET core 6.0 and Visual Studio 2022 to build.
11+
The build requires .NET 8.0 and Visual Studio 2022 to build.
1212

1313
## Build
1414
The build will only work on windows because the source indexer executable is a .net framework executable.

‎azure-pipelines-codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ stages:
4747
useGlobalJson: true
4848

4949
- task: UseDotNet@2
50-
displayName: Install .NET 6.0 runtime
50+
displayName: Install .NET 8.0 runtime
5151
inputs:
5252
packageType: runtime
53-
version: 6.0.x
53+
version: 8.0.x
5454

5555
- task: CodeQL3000Init@0
5656
displayName: CodeQL Initialize

‎azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ jobs:
3737
useGlobalJson: true
3838

3939
- task: UseDotNet@2
40-
displayName: Install .NET 6.0 runtime
40+
displayName: Install .NET 8.0 runtime
4141
inputs:
4242
packageType: runtime
43-
version: 6.0.x
43+
version: 8.0.x
4444

4545
- script: |
4646
dotnet tool restore

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.302",
3+
"version": "8.0.100",
44
"rollForward": "major"
55
}
66
}

‎src/Microsoft.SourceIndexer.Tasks/Microsoft.SourceIndexer.Tasks.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<TargetFramework>net472</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.0" />
7-
<PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" />
8-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.8.0" />
9-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.8.0" />
10-
<PackageReference Include="SharpZipLib" Version="1.3.3" />
6+
<PackageReference Include="Azure.Storage.Blobs" />
7+
<PackageReference Include="Microsoft.Build.Framework" />
8+
<PackageReference Include="Microsoft.Build.Tasks.Core" />
9+
<PackageReference Include="Microsoft.Build.Utilities.Core" />
10+
<PackageReference Include="SharpZipLib" />
1111
</ItemGroup>
1212
</Project>

‎src/SourceBrowser/TestCode/Type.Forwardee/Type.Forwardee.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
33
<PropertyGroup>
4-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
4+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
55
<ProjectGuid>{A2B515A8-9468-4AF5-89CE-807902F03D79}</ProjectGuid>
66
<DefineConstants>TRACE;DEBUG</DefineConstants>
77
<OutputType>Library</OutputType>

‎src/SourceBrowser/TestCode/Type.Forwarder.Reference/Type.Forwarder.Reference.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup Label="Configuration">
44
<AssemblyName>Type.Forwarder</AssemblyName>
55
<RootNamespace>Type.Forwarder</RootNamespace>
6-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
6+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
77
<ProjectGuid>{F922C544-DC33-4C0B-837C-81A65EB37863}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<DefineConstants>TRACE;DEBUG</DefineConstants>

‎src/SourceBrowser/TestCode/Type.Forwarder/Type.Forwarder.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
33
<PropertyGroup>
4-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
4+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
55
<ProjectGuid>{79AEDCEA-6D49-463D-B5B8-2DDF120C0247}</ProjectGuid>
66
<OutputType>Library</OutputType>
77
<DefineConstants>TRACE;DEBUG</DefineConstants>

‎src/SourceBrowser/TestCode/Type.Referencer/Type.Referencer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
33
<PropertyGroup>
4-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
4+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
55
<ProjectGuid>{C34D3731-2CE5-41C2-AFCC-A8A0545D2849}</ProjectGuid>
66
<OutputType>Library</OutputType>
77
<DefineConstants>TRACE;DEBUG</DefineConstants>

‎src/SourceBrowser/src/BinLogParser/BinLogParser.csproj

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net472;net8.0</TargetFrameworks>
55
<AssemblyName>BinLogParser</AssemblyName>
66
<RootNamespace>Microsoft.SourceBrowser.BinLogParser</RootNamespace>
77
</PropertyGroup>
88

9-
<PropertyGroup>
10-
<NuGetVersionRoslyn>3.9.0-2.final</NuGetVersionRoslyn>
11-
</PropertyGroup>
12-
139

1410
<ItemGroup>
15-
<PackageReference Include="Microsoft.Build" Version="17.2.0" NoWarn="NU1701" />
16-
<PackageReference Include="Microsoft.IO.Redist" Version="6.0.0" NoWarn="NU1701" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(NuGetVersionRoslyn)" />
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(NuGetVersionRoslyn)" />
19-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(NuGetVersionRoslyn)" />
20-
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.858" />
11+
<PackageReference Include="Microsoft.Build" />
12+
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
13+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" />
15+
<PackageReference Include="MSBuild.StructuredLogger" />
2116
</ItemGroup>
2217

2318

‎src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<PackAsTool>true</PackAsTool>
7+
<RollForward>Major</RollForward>
78
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
89
<VersionPrefix>1.0.1</VersionPrefix>
910
</PropertyGroup>
1011

1112
<ItemGroup>
12-
<PackageReference Include="LibGit2Sharp" Version="0.26.2" />
13-
<PackageReference Include="Mono.Options" Version="6.6.0.161" />
14-
<PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
13+
<PackageReference Include="LibGit2Sharp" />
14+
<PackageReference Include="Mono.Options" />
15+
<PackageReference Include="System.Reflection.Metadata" />
1516
</ItemGroup>
1617

1718
<ItemGroup>

‎src/SourceBrowser/src/Common/Common.csproj

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>Microsoft.SourceBrowser.Common</AssemblyName>
4-
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net8.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>..\..\key.snk</AssemblyOriginatorKeyFile>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
99
<DefineConstants>$(DefineConstants);NET472</DefineConstants>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Build" Version="17.2.0" NoWarn="NU1701" />
13-
<PackageReference Include="Microsoft.IO.Redist" Version="6.0.0" NoWarn="NU1701" />
14-
<PackageReference Include="System.Reactive" Version="5.0.0" />
12+
<PackageReference Include="Microsoft.Build" />
13+
<PackageReference Include="System.Reactive" />
1514
</ItemGroup>
1615
</Project>

‎src/SourceBrowser/src/Directory.Packages.props

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<!-- msbuild-->
10+
<PackageVersion Include="Microsoft.Build.Framework" Version="17.5.0" />
11+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.5.0" />
12+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.5.0" />
13+
<PackageVersion Include="Microsoft.Build" Version="17.5.0" />
14+
15+
<!-- roslyn -->
16+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.2.0" />
17+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
18+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
19+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.2.0" />
20+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.2.0" />
21+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.2.0" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.2.0" />
23+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.2.0" />
24+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.2.0" />
25+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.2.0" />
26+
27+
<!-- roslyn analyzer -->
28+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
29+
30+
<!-- test dependencies -->
31+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
32+
<PackageVersion Include="MSTest.TestAdapter" Version="1.3.2" />
33+
<PackageVersion Include="MSTest.TestFramework" Version="1.3.2" />
34+
<PackageVersion Include="xunit" Version="2.4.1" />
35+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.1" />
36+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
37+
<PackageVersion Include="Shouldly" Version="4.0.3" />
38+
39+
<!-- other dependencies -->
40+
<PackageVersion Include="LibGit2Sharp" Version="0.29.0" />
41+
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.1.858" />
42+
<PackageVersion Include="ManagedEsent" Version="1.9.4" />
43+
<PackageVersion Include="System.Reactive" Version="5.0.0" />
44+
<PackageVersion Include="System.Composition" Version="6.0.0" />
45+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
46+
47+
<PackageVersion Include="System.Buffers" Version="4.5.1" />
48+
<PackageVersion Include="System.Memory" Version="4.5.5" />
49+
<PackageVersion Include="System.Numerics.Vectors" Version="4.5.0" />
50+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
51+
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
52+
53+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.5.3" />
54+
<PackageVersion Include="Microsoft.NET.StringTools" Version="17.5.0" />
55+
<PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="16.10.230" />
56+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02" />
57+
58+
<PackageVersion Include="ExceptionAnalysis.Diagnostics" Version="1.0.0.39796" />
59+
<PackageVersion Include="GuiLabs.Language.Xml" Version="1.2.46" />
60+
61+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
62+
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
63+
<PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
64+
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
65+
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
66+
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
67+
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
68+
</ItemGroup>
69+
70+
<!-- dependencies for dotnet/source-browser projects -->
71+
<ItemGroup>
72+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.13.0" />
73+
<PackageVersion Include="Mono.Options" Version="6.6.0.161" />
74+
<PackageVersion Include="SharpZipLib" Version="1.3.3" />
75+
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
76+
</ItemGroup>
77+
78+
</Project>

‎src/SourceBrowser/src/GitGlyph/GitGlyph.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Reference Include="System.ComponentModel.Composition" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="LibGit2Sharp" Version="0.25.3" />
12-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.4">
11+
<PackageReference Include="LibGit2Sharp" />
12+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" >
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

‎src/SourceBrowser/src/HtmlGenerator.Tests/HtmlGenerator.Tests.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
5+
<!-- FIXME -->
6+
<NoWarn>$(NoWarn);VSTHRD002</NoWarn>
57
</PropertyGroup>
68

79
<ItemGroup>
8-
<PackageReference Include="LibGit2Sharp" Version="0.25.3" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10-
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
11-
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
12-
<PackageReference Include="Shouldly" Version="4.0.3" />
13-
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
10+
<PackageReference Include="LibGit2Sharp" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="MSTest.TestAdapter" />
13+
<PackageReference Include="MSTest.TestFramework" />
14+
<PackageReference Include="Shouldly" />
1415
</ItemGroup>
1516

1617
<ItemGroup>

0 commit comments

Comments
 (0)