diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..e17e5e9 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,3 @@ + + + diff --git a/README.md b/README.md index 022ba00..8a0b506 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This repo contains the code for building http://source.dot.net 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. ## Build Prerequsites -The build requires .NET core 6.0 and Visual Studio 2022 to build. +The build requires .NET 8.0 and Visual Studio 2022 to build. ## Build The build will only work on windows because the source indexer executable is a .net framework executable. diff --git a/azure-pipelines-codeql.yml b/azure-pipelines-codeql.yml index b52cc4f..0dbe796 100644 --- a/azure-pipelines-codeql.yml +++ b/azure-pipelines-codeql.yml @@ -47,10 +47,10 @@ stages: useGlobalJson: true - task: UseDotNet@2 - displayName: Install .NET 6.0 runtime + displayName: Install .NET 8.0 runtime inputs: packageType: runtime - version: 6.0.x + version: 8.0.x - task: CodeQL3000Init@0 displayName: CodeQL Initialize diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cb8287a..e0c97d8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -37,10 +37,10 @@ jobs: useGlobalJson: true - task: UseDotNet@2 - displayName: Install .NET 6.0 runtime + displayName: Install .NET 8.0 runtime inputs: packageType: runtime - version: 6.0.x + version: 8.0.x - script: | dotnet tool restore diff --git a/global.json b/global.json index d6e2ced..e71d6cc 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.302", + "version": "8.0.100", "rollForward": "major" } } diff --git a/src/Microsoft.SourceIndexer.Tasks/Microsoft.SourceIndexer.Tasks.csproj b/src/Microsoft.SourceIndexer.Tasks/Microsoft.SourceIndexer.Tasks.csproj index 14a3a20..7379b41 100644 --- a/src/Microsoft.SourceIndexer.Tasks/Microsoft.SourceIndexer.Tasks.csproj +++ b/src/Microsoft.SourceIndexer.Tasks/Microsoft.SourceIndexer.Tasks.csproj @@ -3,10 +3,10 @@ net472 - - - - - + + + + + diff --git a/src/SourceBrowser/TestCode/Type.Forwardee/Type.Forwardee.csproj b/src/SourceBrowser/TestCode/Type.Forwardee/Type.Forwardee.csproj index 2124579..add9cf2 100644 --- a/src/SourceBrowser/TestCode/Type.Forwardee/Type.Forwardee.csproj +++ b/src/SourceBrowser/TestCode/Type.Forwardee/Type.Forwardee.csproj @@ -1,7 +1,7 @@  - v4.5 + v4.7.2 {A2B515A8-9468-4AF5-89CE-807902F03D79} TRACE;DEBUG Library diff --git a/src/SourceBrowser/TestCode/Type.Forwarder.Reference/Type.Forwarder.Reference.csproj b/src/SourceBrowser/TestCode/Type.Forwarder.Reference/Type.Forwarder.Reference.csproj index 9ee6246..7546e2f 100644 --- a/src/SourceBrowser/TestCode/Type.Forwarder.Reference/Type.Forwarder.Reference.csproj +++ b/src/SourceBrowser/TestCode/Type.Forwarder.Reference/Type.Forwarder.Reference.csproj @@ -3,7 +3,7 @@ Type.Forwarder Type.Forwarder - v4.5 + v4.7.2 {F922C544-DC33-4C0B-837C-81A65EB37863} Library TRACE;DEBUG diff --git a/src/SourceBrowser/TestCode/Type.Forwarder/Type.Forwarder.csproj b/src/SourceBrowser/TestCode/Type.Forwarder/Type.Forwarder.csproj index fa79f39..b138fd9 100644 --- a/src/SourceBrowser/TestCode/Type.Forwarder/Type.Forwarder.csproj +++ b/src/SourceBrowser/TestCode/Type.Forwarder/Type.Forwarder.csproj @@ -1,7 +1,7 @@  - v4.5 + v4.7.2 {79AEDCEA-6D49-463D-B5B8-2DDF120C0247} Library TRACE;DEBUG diff --git a/src/SourceBrowser/TestCode/Type.Referencer/Type.Referencer.csproj b/src/SourceBrowser/TestCode/Type.Referencer/Type.Referencer.csproj index dbcbab9..62ee9ba 100644 --- a/src/SourceBrowser/TestCode/Type.Referencer/Type.Referencer.csproj +++ b/src/SourceBrowser/TestCode/Type.Referencer/Type.Referencer.csproj @@ -1,7 +1,7 @@  - v4.5 + v4.7.2 {C34D3731-2CE5-41C2-AFCC-A8A0545D2849} Library TRACE;DEBUG diff --git a/src/SourceBrowser/src/BinLogParser/BinLogParser.csproj b/src/SourceBrowser/src/BinLogParser/BinLogParser.csproj index e052f0b..e36baec 100644 --- a/src/SourceBrowser/src/BinLogParser/BinLogParser.csproj +++ b/src/SourceBrowser/src/BinLogParser/BinLogParser.csproj @@ -1,23 +1,18 @@ - netstandard2.0 + net472;net8.0 BinLogParser Microsoft.SourceBrowser.BinLogParser - - 3.9.0-2.final - - - - - - - - + + + + + diff --git a/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj b/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj index 90dd04c..9575971 100644 --- a/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj +++ b/src/SourceBrowser/src/BinLogToSln/BinLogToSln.csproj @@ -2,16 +2,17 @@ Exe - net6.0 + net8.0 true + Major true 1.0.1 - - - + + + diff --git a/src/SourceBrowser/src/Common/Common.csproj b/src/SourceBrowser/src/Common/Common.csproj index 6848b74..4761616 100644 --- a/src/SourceBrowser/src/Common/Common.csproj +++ b/src/SourceBrowser/src/Common/Common.csproj @@ -1,7 +1,7 @@  Microsoft.SourceBrowser.Common - net472;netstandard2.0 + net472;net8.0 true ..\..\key.snk @@ -9,8 +9,7 @@ $(DefineConstants);NET472 - - - + + diff --git a/src/SourceBrowser/src/Directory.Packages.props b/src/SourceBrowser/src/Directory.Packages.props new file mode 100644 index 0000000..2cc5a24 --- /dev/null +++ b/src/SourceBrowser/src/Directory.Packages.props @@ -0,0 +1,78 @@ + + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/SourceBrowser/src/GitGlyph/GitGlyph.csproj b/src/SourceBrowser/src/GitGlyph/GitGlyph.csproj index 930815c..47999e5 100644 --- a/src/SourceBrowser/src/GitGlyph/GitGlyph.csproj +++ b/src/SourceBrowser/src/GitGlyph/GitGlyph.csproj @@ -8,8 +8,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/SourceBrowser/src/HtmlGenerator.Tests/HtmlGenerator.Tests.csproj b/src/SourceBrowser/src/HtmlGenerator.Tests/HtmlGenerator.Tests.csproj index 54dcdea..6314a42 100644 --- a/src/SourceBrowser/src/HtmlGenerator.Tests/HtmlGenerator.Tests.csproj +++ b/src/SourceBrowser/src/HtmlGenerator.Tests/HtmlGenerator.Tests.csproj @@ -2,15 +2,16 @@ net472 + + $(NoWarn);VSTHRD002 - - - - - - + + + + + diff --git a/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj b/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj index 658bce7..6e5d49e 100644 --- a/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj +++ b/src/SourceBrowser/src/HtmlGenerator/HtmlGenerator.csproj @@ -11,12 +11,13 @@ true true $(NoWarn);VSTHRD200 + + $(NoWarn);VSTHRD002 SourceBrowser $(MSBuildProjectDirectory)\$(NuGetPackageId).nuspec 1.0.38 - 4.2.0 @@ -34,48 +35,46 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + all runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/SourceBrowser/src/MEF/MEF.csproj b/src/SourceBrowser/src/MEF/MEF.csproj index 7c90c72..7501c1f 100644 --- a/src/SourceBrowser/src/MEF/MEF.csproj +++ b/src/SourceBrowser/src/MEF/MEF.csproj @@ -8,14 +8,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - - + + + diff --git a/src/SourceBrowser/src/SourceIndexServer.Tests/SourceIndexServer.Tests.csproj b/src/SourceBrowser/src/SourceIndexServer.Tests/SourceIndexServer.Tests.csproj index c43b0ce..9b3f11b 100644 --- a/src/SourceBrowser/src/SourceIndexServer.Tests/SourceIndexServer.Tests.csproj +++ b/src/SourceBrowser/src/SourceIndexServer.Tests/SourceIndexServer.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 @@ -11,14 +11,14 @@ - - - - - + + + + + - + diff --git a/src/SourceBrowser/src/SourceIndexServer/Helpers.cs b/src/SourceBrowser/src/SourceIndexServer/Helpers.cs index 480bf07..ad1e585 100644 --- a/src/SourceBrowser/src/SourceIndexServer/Helpers.cs +++ b/src/SourceBrowser/src/SourceIndexServer/Helpers.cs @@ -50,7 +50,7 @@ public static async Task ProxyRequestAsync(this HttpContext context, HttpClient default: if (!context.Response.Headers.ContainsKey(key)) { - context.Response.Headers.Add(key, values.ToArray()); + context.Response.Headers[key] = values.ToArray(); } break; @@ -64,7 +64,7 @@ public static async Task ProxyRequestAsync(this HttpContext context, HttpClient { if (!context.Response.Headers.ContainsKey(key)) { - context.Response.Headers.Add(key, values.ToArray()); + context.Response.Headers[key] = values.ToArray(); } } diff --git a/src/SourceBrowser/src/SourceIndexServer/SourceIndexServer.csproj b/src/SourceBrowser/src/SourceIndexServer/SourceIndexServer.csproj index 29c47ba..a19546a 100644 --- a/src/SourceBrowser/src/SourceIndexServer/SourceIndexServer.csproj +++ b/src/SourceBrowser/src/SourceIndexServer/SourceIndexServer.csproj @@ -1,14 +1,14 @@  - net6.0 + net8.0 Microsoft.SourceBrowser.SourceIndexServer Microsoft.SourceBrowser.SourceIndexServer OutOfProcess - + @@ -16,7 +16,7 @@ - + diff --git a/src/UploadIndexStage1/UploadIndexStage1.csproj b/src/UploadIndexStage1/UploadIndexStage1.csproj index 8be7d07..b7a16ca 100644 --- a/src/UploadIndexStage1/UploadIndexStage1.csproj +++ b/src/UploadIndexStage1/UploadIndexStage1.csproj @@ -2,16 +2,17 @@ Exe - net6.0 + net8.0 true + Major true 1.0.1 - - - + + +