diff --git a/pipelines/build-pipeline.yml b/pipelines/build-pipeline.yml index 35daeebe..70681330 100644 --- a/pipelines/build-pipeline.yml +++ b/pipelines/build-pipeline.yml @@ -60,9 +60,10 @@ extends: - task: NuGetAuthenticate@1 displayName: "Authenticate with NuGet feeds" - task: UseDotNet@2 - displayName: Use .NET 8 SDK + displayName: Use .NET 10 SDK inputs: - version: 8.x + packageType: sdk + version: 10.x includePreviewVersions: true - script: | cd src/apisof.net diff --git a/pipelines/build-telemetry.yml b/pipelines/build-telemetry.yml index bd94cea1..74bec8a7 100644 --- a/pipelines/build-telemetry.yml +++ b/pipelines/build-telemetry.yml @@ -45,9 +45,11 @@ extends: steps: - checkout: self - task: UseDotNet@2 - displayName: Use .NET 8 SDK + displayName: Use .NET 10 SDK inputs: - version: 8.x + packageType: sdk + version: 10.x + includePreviewVersions: true - script: | dotnet publish src/NetUpgradePlannerTelemetry/NetUpgradePlannerTelemetry.csproj -o "$(Build.ArtifactStagingDirectory)/publish" /p:SourceRevisionId=$(Build.SourceVersion) displayName: Publish Function diff --git a/pipelines/gen-catalog.yml b/pipelines/gen-catalog.yml index f28f1b5a..8f698ccf 100644 --- a/pipelines/gen-catalog.yml +++ b/pipelines/gen-catalog.yml @@ -57,10 +57,11 @@ extends: clean: true fetchDepth: 0 - task: UseDotNet@2 - displayName: "Install .NET 8" + displayName: "Install .NET 10" inputs: packageType: sdk - version: 8.x + version: 10.x + includePreviewVersions: true - task: NuGetAuthenticate@1 displayName: "NuGet Authenticate" - script: | diff --git a/pipelines/gen-design-notes.yml b/pipelines/gen-design-notes.yml index 1c35f9c8..3615013a 100644 --- a/pipelines/gen-design-notes.yml +++ b/pipelines/gen-design-notes.yml @@ -61,9 +61,11 @@ extends: steps: - checkout: self - task: UseDotNet@2 - displayName: Use .NET 8 SDK + displayName: Use .NET 10 SDK inputs: - version: 8.x + packageType: sdk + version: 10.x + includePreviewVersions: true - task: NugetAuthenticate@1 displayName: Authenticate with NuGet - script: | diff --git a/pipelines/gen-usage-pipeline.yml b/pipelines/gen-usage-pipeline.yml index 97abf4c9..e1337555 100644 --- a/pipelines/gen-usage-pipeline.yml +++ b/pipelines/gen-usage-pipeline.yml @@ -65,9 +65,10 @@ extends: steps: - checkout: self - task: UseDotNet@2 - displayName: Use .NET 8 SDK + displayName: Use .NET 10 SDK inputs: - version: 8.x + version: 10.x + packageType: sdk includePreviewVersions: true - task: NuGetAuthenticate@1 displayName: "NuGet Authenticate" diff --git a/pipelines/release-gen-design-notes-pipeline.yml b/pipelines/release-gen-design-notes-pipeline.yml index 0bedad51..24d78d7c 100644 --- a/pipelines/release-gen-design-notes-pipeline.yml +++ b/pipelines/release-gen-design-notes-pipeline.yml @@ -48,6 +48,12 @@ extends: artifactName: "gen-design-notes-drop" targetPath: "$(Pipeline.Workspace)/gen-design-notes-drop" steps: + - task: UseDotNet@2 + displayName: "Install .NET 10" + inputs: + packageType: sdk + version: 10.x + includePreviewVersions: true - task: AzureCLI@2 displayName: "Upload GenDesignNotes Dev" inputs: @@ -78,6 +84,12 @@ extends: artifactName: "gen-design-notes-drop" targetPath: "$(Pipeline.Workspace)/gen-design-notes-drop" steps: + - task: UseDotNet@2 + displayName: "Install .NET 10" + inputs: + packageType: sdk + version: 10.x + includePreviewVersions: true - task: AzureCLI@2 displayName: "Run GenDesignNotes (Prod)" inputs: @@ -90,4 +102,4 @@ extends: dotnet GenDesignNotes.dll env: AzureStorageServiceUrl: $(AzureStorageServiceUrlProd) - ApisOfDotNetWebHookSecret: $(ApisOfDotNetWebHookSecretProd) + ApisOfDotNetWebHookSecret: $(ApisOfDotNetWebHookSecretProd) \ No newline at end of file diff --git a/pipelines/release-telemetry.yml b/pipelines/release-telemetry.yml index 65e5f52b..11be626a 100644 --- a/pipelines/release-telemetry.yml +++ b/pipelines/release-telemetry.yml @@ -42,7 +42,7 @@ extends: displayName: Deploy Azure Function inputs: connectedServiceNameARM: "$(AzureDevSubscriptionConnection)" - runtimeStack: DOTNET|8.0 + runtimeStack: DOTNET|10.0 appType: functionAppLinux appName: apisofdotnetplanner-dev package: "$(Pipeline.Workspace)/telemetry-drop/telemetry.zip" diff --git a/pipelines/templates/steps-build-planner.yml b/pipelines/templates/steps-build-planner.yml index 80895fc7..2585c1b7 100644 --- a/pipelines/templates/steps-build-planner.yml +++ b/pipelines/templates/steps-build-planner.yml @@ -6,9 +6,11 @@ steps: - task: NuGetAuthenticate@1 displayName: "NuGet Authenticate" - task: UseDotNet@2 - displayName: "Use .NET 8 SDK" + displayName: "Use .NET 10 SDK" inputs: - version: 8.x + packageType: sdk + version: 10.x + includePreviewVersions: true - pwsh: | $ErrorActionPreference = 'Stop' $config = "$(Build.SourcesDirectory)/src/nuget.config" diff --git a/pipelines/templates/steps-gen-catalog-run.yml b/pipelines/templates/steps-gen-catalog-run.yml index 6e29c257..ca8f19f2 100644 --- a/pipelines/templates/steps-gen-catalog-run.yml +++ b/pipelines/templates/steps-gen-catalog-run.yml @@ -5,6 +5,12 @@ parameters: steps: - task: NugetAuthenticate@1 displayName: "Authenticate with NuGet feed" + - task: UseDotNet@2 + displayName: "Install .NET 10" + inputs: + packageType: sdk + version: 10.x + includePreviewVersions: true - task: AzureCLI@2 displayName: "Run GenCatalog" timeoutInMinutes: 0 @@ -14,7 +20,7 @@ steps: scriptLocation: "inlineScript" addSpnToEnvironment: true inlineScript: | - $env:APISOFDOTNET_INDEX_PATH = "$(Pipeline.Workspace)/catalog" + $env:APISOFDOTNET_INDEX_PATH = "$(Pipeline.Workspace)\catalog" if (Test-Path $env:APISOFDOTNET_INDEX_PATH) { Remove-Item -Recurse -Force $env:APISOFDOTNET_INDEX_PATH } @@ -24,12 +30,13 @@ steps: New-Item -ItemType Directory -Force -Path "$env:APISOFDOTNET_INDEX_PATH/packs" | Out-Null New-Item -ItemType Directory -Force -Path "$env:APISOFDOTNET_INDEX_PATH/packages" | Out-Null - dotnet "$(Pipeline.Workspace)/gen-catalog-drop/publish-gen-catalog/GenCatalog.dll" + dotnet "$(Pipeline.Workspace)\gen-catalog-drop\publish-gen-catalog\GenCatalog.dll" env: AzureStorageServiceUrl: $(AzureStorageServiceUrl) ApisOfDotNetWebHookSecret: $(ApisOfDotNetWebHookSecret) - APISOFDOTNET_INDEX_PATH: $(Pipeline.Workspace)/catalog + APISOFDOTNET_INDEX_PATH: $(Pipeline.Workspace)\catalog DOTNET_gcServer: 0 DOTNET_GCConserveMemory: 9 DOTNET_GCHeapHardLimitPercent: 75 DOTNET_GCHeapHardLimit: 5368709120 + diff --git a/pipelines/templates/steps-gen-usage.yml b/pipelines/templates/steps-gen-usage.yml index d4676e96..fb9d55b2 100644 --- a/pipelines/templates/steps-gen-usage.yml +++ b/pipelines/templates/steps-gen-usage.yml @@ -34,6 +34,13 @@ steps: - task: NuGetAuthenticate@1 displayName: "Authenticate with NuGet feed" + - task: UseDotNet@2 + displayName: "Install .NET 10" + inputs: + packageType: sdk + version: 10.x + includePreviewVersions: true + - ${{ each tool in parameters.Tools }}: - task: AzureCLI@2 displayName: "Run ${{ tool.name }} (${{ parameters.BuildType }})" diff --git a/pipelines/templates/upload-build-planner.yml b/pipelines/templates/upload-build-planner.yml index 0c0668dc..032e441a 100644 --- a/pipelines/templates/upload-build-planner.yml +++ b/pipelines/templates/upload-build-planner.yml @@ -8,9 +8,11 @@ steps: - task: NuGetAuthenticate@1 displayName: "NuGet Authenticate" - task: UseDotNet@2 - displayName: "Use .NET 8" + displayName: "Use .NET 10" inputs: - version: 8.x + packageType: sdk + version: 10.x + includePreviewVersions: true - pwsh: | $ErrorActionPreference = 'Stop' $config = "$(Pipeline.Workspace)/velopack-input/nuget.config" diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 9d98822a..a04f94ee 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -5,7 +5,8 @@ - + + @@ -19,18 +20,18 @@ - - - - + + + + - - - - + + + + @@ -46,8 +47,8 @@ - - - + + + \ No newline at end of file diff --git a/src/DumpMissingNetFxFeatures/DumpMissingNetFxFeatures.csproj b/src/DumpMissingNetFxFeatures/DumpMissingNetFxFeatures.csproj index 0240c030..a90d63e5 100644 --- a/src/DumpMissingNetFxFeatures/DumpMissingNetFxFeatures.csproj +++ b/src/DumpMissingNetFxFeatures/DumpMissingNetFxFeatures.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable diff --git a/src/DumpPackageList/DumpPackageList.csproj b/src/DumpPackageList/DumpPackageList.csproj index ce19c6e5..ff17ceb8 100644 --- a/src/DumpPackageList/DumpPackageList.csproj +++ b/src/DumpPackageList/DumpPackageList.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable diff --git a/src/DumpPacks/DumpPacks.csproj b/src/DumpPacks/DumpPacks.csproj index 806679c2..2e3caa60 100644 --- a/src/DumpPacks/DumpPacks.csproj +++ b/src/DumpPacks/DumpPacks.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable diff --git a/src/GenCatalog/GenCatalog.csproj b/src/GenCatalog/GenCatalog.csproj index ea84a025..b2a681da 100644 --- a/src/GenCatalog/GenCatalog.csproj +++ b/src/GenCatalog/GenCatalog.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable enable diff --git a/src/GenDesignNotes/GenDesignNotes.csproj b/src/GenDesignNotes/GenDesignNotes.csproj index e928feac..aa665052 100644 --- a/src/GenDesignNotes/GenDesignNotes.csproj +++ b/src/GenDesignNotes/GenDesignNotes.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable diff --git a/src/GenUsage/GenUsage.csproj b/src/GenUsage/GenUsage.csproj index 6c5edd54..590ab648 100644 --- a/src/GenUsage/GenUsage.csproj +++ b/src/GenUsage/GenUsage.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable diff --git a/src/GenUsageNuGet/GenUsageNuGet.csproj b/src/GenUsageNuGet/GenUsageNuGet.csproj index dc7315d5..c6ca2067 100644 --- a/src/GenUsageNuGet/GenUsageNuGet.csproj +++ b/src/GenUsageNuGet/GenUsageNuGet.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable diff --git a/src/GenUsagePlanner/GenUsagePlanner.csproj b/src/GenUsagePlanner/GenUsagePlanner.csproj index 7acded07..6c6f0ee9 100644 --- a/src/GenUsagePlanner/GenUsagePlanner.csproj +++ b/src/GenUsagePlanner/GenUsagePlanner.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable diff --git a/src/NetUpgradePlanner/App.manifest b/src/NetUpgradePlanner/App.manifest index 82254ecd..4bc59aee 100644 --- a/src/NetUpgradePlanner/App.manifest +++ b/src/NetUpgradePlanner/App.manifest @@ -41,7 +41,6 @@ - true true diff --git a/src/NetUpgradePlanner/NetUpgradePlanner.csproj b/src/NetUpgradePlanner/NetUpgradePlanner.csproj index 8185599b..8869697d 100644 --- a/src/NetUpgradePlanner/NetUpgradePlanner.csproj +++ b/src/NetUpgradePlanner/NetUpgradePlanner.csproj @@ -1,14 +1,15 @@ - + WinExe - net8.0-windows + net10.0-windows enable enable true true NetUpgradePlanner.ico App.manifest + PerMonitorV2 .NET Upgrade Planner $(Product) WFAC010 diff --git a/src/NetUpgradePlannerTelemetry/NetUpgradePlannerTelemetry.csproj b/src/NetUpgradePlannerTelemetry/NetUpgradePlannerTelemetry.csproj index 4571495b..6a3ff3f1 100644 --- a/src/NetUpgradePlannerTelemetry/NetUpgradePlannerTelemetry.csproj +++ b/src/NetUpgradePlannerTelemetry/NetUpgradePlannerTelemetry.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 v4 Exe enable diff --git a/src/Terrajobst.ApiCatalog.ActionsRunner/Terrajobst.ApiCatalog.ActionsRunner.csproj b/src/Terrajobst.ApiCatalog.ActionsRunner/Terrajobst.ApiCatalog.ActionsRunner.csproj index fc567840..1df844c3 100644 --- a/src/Terrajobst.ApiCatalog.ActionsRunner/Terrajobst.ApiCatalog.ActionsRunner.csproj +++ b/src/Terrajobst.ApiCatalog.ActionsRunner/Terrajobst.ApiCatalog.ActionsRunner.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable diff --git a/src/Terrajobst.ApiCatalog.DesignNotes/Terrajobst.ApiCatalog.DesignNotes.csproj b/src/Terrajobst.ApiCatalog.DesignNotes/Terrajobst.ApiCatalog.DesignNotes.csproj index c4cc1724..0fbaeacc 100644 --- a/src/Terrajobst.ApiCatalog.DesignNotes/Terrajobst.ApiCatalog.DesignNotes.csproj +++ b/src/Terrajobst.ApiCatalog.DesignNotes/Terrajobst.ApiCatalog.DesignNotes.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable Terrajobst.ApiCatalog.ReviewNotes diff --git a/src/Terrajobst.ApiCatalog.Generation/Terrajobst.ApiCatalog.Generation.csproj b/src/Terrajobst.ApiCatalog.Generation/Terrajobst.ApiCatalog.Generation.csproj index 97fa3db4..0e352707 100644 --- a/src/Terrajobst.ApiCatalog.Generation/Terrajobst.ApiCatalog.Generation.csproj +++ b/src/Terrajobst.ApiCatalog.Generation/Terrajobst.ApiCatalog.Generation.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable diff --git a/src/Terrajobst.ApiCatalog.SuffixTree/Terrajobst.ApiCatalog.SuffixTree.csproj b/src/Terrajobst.ApiCatalog.SuffixTree/Terrajobst.ApiCatalog.SuffixTree.csproj index a592a625..1a2b23d2 100644 --- a/src/Terrajobst.ApiCatalog.SuffixTree/Terrajobst.ApiCatalog.SuffixTree.csproj +++ b/src/Terrajobst.ApiCatalog.SuffixTree/Terrajobst.ApiCatalog.SuffixTree.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable Terrajobst.SuffixTree diff --git a/src/Terrajobst.ApiCatalog.Tests/Terrajobst.ApiCatalog.Tests.csproj b/src/Terrajobst.ApiCatalog.Tests/Terrajobst.ApiCatalog.Tests.csproj index 3f863872..d0508866 100644 --- a/src/Terrajobst.ApiCatalog.Tests/Terrajobst.ApiCatalog.Tests.csproj +++ b/src/Terrajobst.ApiCatalog.Tests/Terrajobst.ApiCatalog.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable false diff --git a/src/Terrajobst.ApiCatalog/CatalogModel/ApiCatalogModel.cs b/src/Terrajobst.ApiCatalog/CatalogModel/ApiCatalogModel.cs index d879cd6b..b2aaddc5 100644 --- a/src/Terrajobst.ApiCatalog/CatalogModel/ApiCatalogModel.cs +++ b/src/Terrajobst.ApiCatalog/CatalogModel/ApiCatalogModel.cs @@ -248,6 +248,13 @@ internal string GetString(int offset) internal Markup GetMarkup(int offset) { + // A negative offset is the sentinel for "no markup" -- the same convention + // used for absent references in this blob format (see the ReferenceToken + // handling below). Some declarations legitimately have no markup, so return + // an empty markup instead of indexing past the heap and throwing. + if (offset < 0) + return new Markup(Array.Empty()); + var span = BlobHeap[offset..]; var tokenCount = BinaryPrimitives.ReadInt32LittleEndian(span); span = span[4..]; @@ -987,4 +994,4 @@ void IDisposable.Dispose() { } } -} \ No newline at end of file +} diff --git a/src/Terrajobst.ApiCatalog/CatalogModel/PlatformAnnotationContext.cs b/src/Terrajobst.ApiCatalog/CatalogModel/PlatformAnnotationContext.cs index 7cb918b9..0ac48180 100644 --- a/src/Terrajobst.ApiCatalog/CatalogModel/PlatformAnnotationContext.cs +++ b/src/Terrajobst.ApiCatalog/CatalogModel/PlatformAnnotationContext.cs @@ -117,8 +117,7 @@ private IEnumerable GetKnownPlatforms() t5.Kind == MarkupTokenKind.CloseParenToken && t6.Kind == MarkupTokenKind.CloseBracketToken) { - var literalWithoutQuotes = t4.Text.Substring(1, t4.Text.Length - 2); - var impliedPlatformName = literalWithoutQuotes; + var impliedPlatformName = UnquoteLiteral(t4.Text); yield return (platformName, impliedPlatformName); } } @@ -128,6 +127,19 @@ private IEnumerable GetKnownPlatforms() } } + private static string UnquoteLiteral(string text) + { + // LiteralString tokens are stored as C# string literals (e.g. "windows"). + // Strip the surrounding quotes to recover the platform name. The guard keeps + // the original behavior for the expected quoted form while avoiding the + // out-of-range trim the old Substring(1, Length - 2) performed on + // unexpectedly short or unquoted text. + if (text.Length >= 2 && text[0] == '"' && text[^1] == '"') + return text.Substring(1, text.Length - 2); + + return text; + } + private static bool TryGetPlatformFromIsPlatformMethod(ApiModel operatingSystemMember, [MaybeNullWhen(false)] out string platformName) { const string prefix = "Is"; @@ -263,4 +275,4 @@ public static (string Name, Version Version) ParsePlatform(string nameAndVersion var framework = NuGetFramework.Parse("net5.0-" + nameAndVersion); return (framework.Platform, framework.PlatformVersion); } -} \ No newline at end of file +} diff --git a/src/Terrajobst.ApiCatalog/Terrajobst.ApiCatalog.csproj b/src/Terrajobst.ApiCatalog/Terrajobst.ApiCatalog.csproj index 28741efe..aa8d0dd2 100644 --- a/src/Terrajobst.ApiCatalog/Terrajobst.ApiCatalog.csproj +++ b/src/Terrajobst.ApiCatalog/Terrajobst.ApiCatalog.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable True diff --git a/src/Terrajobst.NetUpgradePlanner.Excel/Terrajobst.NetUpgradePlanner.Excel.csproj b/src/Terrajobst.NetUpgradePlanner.Excel/Terrajobst.NetUpgradePlanner.Excel.csproj index cfa66963..378b18bf 100644 --- a/src/Terrajobst.NetUpgradePlanner.Excel/Terrajobst.NetUpgradePlanner.Excel.csproj +++ b/src/Terrajobst.NetUpgradePlanner.Excel/Terrajobst.NetUpgradePlanner.Excel.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable Terrajobst.NetUpgradePlanner diff --git a/src/Terrajobst.NetUpgradePlanner/Terrajobst.NetUpgradePlanner.csproj b/src/Terrajobst.NetUpgradePlanner/Terrajobst.NetUpgradePlanner.csproj index d3a8ba4d..469771c7 100644 --- a/src/Terrajobst.NetUpgradePlanner/Terrajobst.NetUpgradePlanner.csproj +++ b/src/Terrajobst.NetUpgradePlanner/Terrajobst.NetUpgradePlanner.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable True diff --git a/src/Terrajobst.UsageCrawling.Storage.Tests/Terrajobst.UsageCrawling.Storage.Tests.csproj b/src/Terrajobst.UsageCrawling.Storage.Tests/Terrajobst.UsageCrawling.Storage.Tests.csproj index c7f24209..7b08e9f8 100644 --- a/src/Terrajobst.UsageCrawling.Storage.Tests/Terrajobst.UsageCrawling.Storage.Tests.csproj +++ b/src/Terrajobst.UsageCrawling.Storage.Tests/Terrajobst.UsageCrawling.Storage.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable false diff --git a/src/Terrajobst.UsageCrawling.Storage/Terrajobst.UsageCrawling.Storage.csproj b/src/Terrajobst.UsageCrawling.Storage/Terrajobst.UsageCrawling.Storage.csproj index 54833c84..a1d238e6 100644 --- a/src/Terrajobst.UsageCrawling.Storage/Terrajobst.UsageCrawling.Storage.csproj +++ b/src/Terrajobst.UsageCrawling.Storage/Terrajobst.UsageCrawling.Storage.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable diff --git a/src/Terrajobst.UsageCrawling.Tests/Collectors/TargetFrameworkCollectorTests.cs b/src/Terrajobst.UsageCrawling.Tests/Collectors/TargetFrameworkCollectorTests.cs index 809a1129..2b17c6c7 100644 --- a/src/Terrajobst.UsageCrawling.Tests/Collectors/TargetFrameworkCollectorTests.cs +++ b/src/Terrajobst.UsageCrawling.Tests/Collectors/TargetFrameworkCollectorTests.cs @@ -32,6 +32,12 @@ public void TargetFrameworkCollector_Prefers_TargetFramework_Over_References() Check(TargetFramework.Net80, source, [FeatureUsage.ForTargetFramework("net5.1")]); } + + [Fact] + public void TargetFrameworkCollector_Infers_Net100() + { + Check(TargetFramework.Net10, string.Empty, [FeatureUsage.ForTargetFramework("net10.0")]); + } [Fact] public void TargetFrameworkCollector_Infers_NetCoreApp80() diff --git a/src/Terrajobst.UsageCrawling.Tests/Collectors/UsesNullableReferenceTypesCollectorTests.cs b/src/Terrajobst.UsageCrawling.Tests/Collectors/UsesNullableReferenceTypesCollectorTests.cs index 962e2952..533294ba 100644 --- a/src/Terrajobst.UsageCrawling.Tests/Collectors/UsesNullableReferenceTypesCollectorTests.cs +++ b/src/Terrajobst.UsageCrawling.Tests/Collectors/UsesNullableReferenceTypesCollectorTests.cs @@ -78,7 +78,7 @@ public static IEnumerable GetNullableModes() private static CSharpCompilation ApplyNullableMode(CSharpCompilation compilation, NullableMode mode) { var references = mode == NullableMode.ReferencedFrameworkTypes - ? Net80.References.All + ? Net100.References.All : NetStandard20.References.All; return compilation.WithReferences(references); diff --git a/src/Terrajobst.UsageCrawling.Tests/Infra/AssemblyBuilder.cs b/src/Terrajobst.UsageCrawling.Tests/Infra/AssemblyBuilder.cs index 4fefcd4b..213f3751 100644 --- a/src/Terrajobst.UsageCrawling.Tests/Infra/AssemblyBuilder.cs +++ b/src/Terrajobst.UsageCrawling.Tests/Infra/AssemblyBuilder.cs @@ -14,7 +14,7 @@ public sealed class AssemblyBuilder public AssemblyBuilder SetAssembly( string source, - TargetFramework framework = TargetFramework.Net80, + TargetFramework framework = TargetFramework.Net10, Func? transformer = null ) { @@ -27,7 +27,7 @@ public AssemblyBuilder SetAssembly( return this; } - public AssemblyBuilder AddDependency(string source, TargetFramework framework = TargetFramework.Net80) + public AssemblyBuilder AddDependency(string source, TargetFramework framework = TargetFramework.Net10) { var compilation = CreateCompilation(source, framework); _dependencies.Add(compilation); @@ -74,6 +74,7 @@ private static IEnumerable GetReferences(TargetFramework fram { return framework switch { + TargetFramework.Net10 => Net100.References.All, TargetFramework.Net80 => Net80.References.All, TargetFramework.Net472 => Net472.References.All, TargetFramework.NetStandard20 => NetStandard20.References.All, diff --git a/src/Terrajobst.UsageCrawling.Tests/Infra/TargetFramework.cs b/src/Terrajobst.UsageCrawling.Tests/Infra/TargetFramework.cs index cc816502..ee6df7ff 100644 --- a/src/Terrajobst.UsageCrawling.Tests/Infra/TargetFramework.cs +++ b/src/Terrajobst.UsageCrawling.Tests/Infra/TargetFramework.cs @@ -2,6 +2,7 @@ public enum TargetFramework { + Net10, Net80, Net472, NetStandard20, diff --git a/src/Terrajobst.UsageCrawling.Tests/Terrajobst.UsageCrawling.Tests.csproj b/src/Terrajobst.UsageCrawling.Tests/Terrajobst.UsageCrawling.Tests.csproj index cb16a6fb..d5b6a559 100644 --- a/src/Terrajobst.UsageCrawling.Tests/Terrajobst.UsageCrawling.Tests.csproj +++ b/src/Terrajobst.UsageCrawling.Tests/Terrajobst.UsageCrawling.Tests.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable false @@ -10,6 +10,7 @@ + diff --git a/src/Terrajobst.UsageCrawling/Collectors/IncrementalUsageCollector.cs b/src/Terrajobst.UsageCrawling/Collectors/IncrementalUsageCollector.cs index 8b0361a8..6a633ab8 100644 --- a/src/Terrajobst.UsageCrawling/Collectors/IncrementalUsageCollector.cs +++ b/src/Terrajobst.UsageCrawling/Collectors/IncrementalUsageCollector.cs @@ -35,8 +35,6 @@ internal Context(HashSet receiver) public void Report(FeatureUsage feature) { - ThrowIfNull(feature); - _receiver.Add(feature); } } diff --git a/src/Terrajobst.UsageCrawling/Terrajobst.UsageCrawling.csproj b/src/Terrajobst.UsageCrawling/Terrajobst.UsageCrawling.csproj index 42e1a646..fc42b954 100644 --- a/src/Terrajobst.UsageCrawling/Terrajobst.UsageCrawling.csproj +++ b/src/Terrajobst.UsageCrawling/Terrajobst.UsageCrawling.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable True diff --git a/src/apisof.net/apisof.net.csproj b/src/apisof.net/apisof.net.csproj index 09098b9f..83942d56 100644 --- a/src/apisof.net/apisof.net.csproj +++ b/src/apisof.net/apisof.net.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 enable enable ApisOfDotNet diff --git a/src/apisofdotnet/apisofdotnet.csproj b/src/apisofdotnet/apisofdotnet.csproj index d3f5f23a..c29b46c3 100644 --- a/src/apisofdotnet/apisofdotnet.csproj +++ b/src/apisofdotnet/apisofdotnet.csproj @@ -1,8 +1,8 @@ - + Exe - net8.0 + net10.0 enable enable