Skip to content

Commit

Permalink
SDK - Updated DotNet SDK to 8.0.200 (#145)
Browse files Browse the repository at this point in the history 
<!--- Provide a general summary of your changes in the Title above that
includes the Jira Ticket -->

# Description
<!--- Describe your changes in detail -->

# Related Issue\Feature
<!--- Please link to the issue or feature: -->

# How Has This Been Tested
- [ ] All unit tests pass.
- [ ] All integration tests pass.
- [ ] Manual Testing:
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

# Types of changes
<!--- What types of changes does your code introduce? Put an 'x' in all
the boxes that apply: -->
<!-- Note that you can just click these after submission and it will
remember the tick for you -->
- [ ] Docs change
- [ ] Refactoring
- [ ] Dependency upgrade
- [ ] Additional Unit Tests\Integration Tests
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Removed no-longer used code

## Deployment Configuration Changes
- [ ] Requires deployment configuration changes as specified below and
in CHANGELOG.md
<!--- Insert Deployment configuration changes here -->

# Checklist
<!--- Go over all the following points, and put an 'x' in all the boxes
once they are true. -->
<!-- Note that you can just click these after submission and it will
remember the tick for you -->
- [ ] There are no Resharper\static code analysis errors anywhere in the
solution.
- [ ] I have ONLY run a code clean-up on any files I have modified to
make sure they are in the correct format and no others.
- [ ] I have added tests to cover my changes.
- [ ] I have run the code and quickly verified it all works to my
satisfaction.
- [ ] All new/modified code has sufficient logging to be able to
diagnose what is wrong.
- [ ] All new and existing tests passed.
- [ ] All new/modified public interfaces/classes have are documented
with xmldoc comments.
- [ ] Unreleased section of CHANGELOG.md has been updated with details
of this PR.
  • Loading branch information
@credfeto
credfeto authored Feb 15, 2024
2 parents 0bb343d + 41fd66f commit 8b94007
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 105 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
- Dependencies - Updated Meziantou.Analyzer to 2.0.141
- Dependencies - Updated NSubstitute.Analyzers.CSharp to 1.0.17
- Dependencies - Updated NuGet to 6.9.1
- SDK - Updated DotNet SDK to 8.0.200
### Removed
### Deployment Changes

Expand Down
25 changes: 10 additions & 15 deletions src/FunFair.BuildCheck.ProjectChecks/Helpers/ProjectValueHelpers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ namespace FunFair.BuildCheck.ProjectChecks.Helpers;

internal static class ProjectValueHelpers
{
private static readonly IReadOnlyList<string> PackagesForTestProjectDetection = new[]
{
"xunit",
"xunit.runner.visualstudio",
"NSubstitute",
"Microsoft.NET.Test.Sdk",
"TeamCity.VSTest.TestAdapter",
"FunFair.Test.Common"
};
private static readonly IReadOnlyList<string> PackagesForTestProjectDetection =
[
"xunit",
"xunit.runner.visualstudio",
"NSubstitute",
"Microsoft.NET.Test.Sdk",
"TeamCity.VSTest.TestAdapter",
"FunFair.Test.Common"
];

public static bool IsDotNetTool(this XmlDocument project)
{
Expand Down Expand Up @@ -151,12 +151,7 @@ public static void CheckValue(string projectName, XmlDocument project, string no
CheckValueCommon(projectName: projectName, project: project, nodePresence: nodePresence, isRequiredValue: isRequiredValue, requiredValueDisplayText: msg, logger: logger);
}

private static void CheckValueCommon(string projectName,
XmlDocument project,
string nodePresence,
Func<string, bool> isRequiredValue,
string requiredValueDisplayText,
ILogger logger)
private static void CheckValueCommon(string projectName, XmlDocument project, string nodePresence, Func<string, bool> isRequiredValue, string requiredValueDisplayText, ILogger logger)
{
bool hasGlobalSetting = CheckGlobalSettings(project: project, nodePresence: nodePresence, isRequiredValue: isRequiredValue);

Expand Down
10 changes: 5 additions & 5 deletions src/FunFair.BuildCheck.ProjectChecks/ReferencedPackages/MustNotDisableUnexpectedWarnings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ namespace FunFair.BuildCheck.ProjectChecks.ReferencedPackages;

public sealed class MustNotDisableUnexpectedWarnings : IProjectCheck
{
private static readonly IReadOnlyList<string> AllowedWarnings = new[]
{
// Xml Docs
"1591"
};
private static readonly IReadOnlyList<string> AllowedWarnings =
[
// Xml Docs
"1591"
];

private static readonly IReadOnlyList<string> AllowedTestProjectWarnings = Array.Empty<string>();

Expand Down
166 changes: 82 additions & 84 deletions ...air.BuildCheck.ProjectChecks/ReferencedPackages/MustNotReferenceObsoleteAspNetPackages.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,94 +5,92 @@ namespace FunFair.BuildCheck.ProjectChecks.ReferencedPackages;

public sealed class MustNotReferenceObsoleteAspNetPackages : MustNotReferencePackages
{
private static readonly IReadOnlyList<string> PackageIds = new[]
{
"Microsoft.AspNetCore",
"Microsoft.AspNetCore.All",
"Microsoft.AspNetCore.App",
"Microsoft.AspNetCore.Antiforgery",
"Microsoft.AspNetCore.Authentication",
"Microsoft.AspNetCore.Authentication.Abstractions",
"Microsoft.AspNetCore.Authentication.Cookies",
"Microsoft.AspNetCore.Authentication.Core",
private static readonly IReadOnlyList<string> PackageIds =
[
"Microsoft.AspNetCore",
"Microsoft.AspNetCore.All",
"Microsoft.AspNetCore.App",
"Microsoft.AspNetCore.Antiforgery",
"Microsoft.AspNetCore.Authentication",
"Microsoft.AspNetCore.Authentication.Abstractions",
"Microsoft.AspNetCore.Authentication.Cookies",
"Microsoft.AspNetCore.Authentication.Core",

//"Microsoft.AspNetCore.Authentication.JwtBearer",
"Microsoft.AspNetCore.Authentication.OAuth",
"Microsoft.AspNetCore.Authentication.OpenIdConnect",
"Microsoft.AspNetCore.Authorization",
"Microsoft.AspNetCore.Authorization.Policy",
"Microsoft.AspNetCore.CookiePolicy",
"Microsoft.AspNetCore.Cors",
"Microsoft.AspNetCore.Cryptography.Internal",
"Microsoft.AspNetCore.Cryptography.KeyDerivation",
"Microsoft.AspNetCore.DataProtection",
"Microsoft.AspNetCore.DataProtection.Abstractions",
"Microsoft.AspNetCore.DataProtection.Extensions",
"Microsoft.AspNetCore.Diagnostics",
"Microsoft.AspNetCore.Diagnostics.HealthChecks",
"Microsoft.AspNetCore.HostFiltering",
"Microsoft.AspNetCore.Hosting",
"Microsoft.AspNetCore.Hosting.Abstractions",
"Microsoft.AspNetCore.Hosting.Server.Abstractions",
"Microsoft.AspNetCore.Http",
"Microsoft.AspNetCore.Http.Abstractions",
"Microsoft.AspNetCore.Http.Connections",
"Microsoft.AspNetCore.Http.Extensions",
"Microsoft.AspNetCore.Http.Features",
"Microsoft.AspNetCore.HttpOverrides",
"Microsoft.AspNetCore.HttpsPolicy",
"Microsoft.AspNetCore.Identity",
"Microsoft.AspNetCore.Localization",
"Microsoft.AspNetCore.Localization.Routing",
"Microsoft.AspNetCore.MiddlewareAnalysis",
"Microsoft.AspNetCore.Mvc",
//"Microsoft.AspNetCore.Authentication.JwtBearer",
"Microsoft.AspNetCore.Authentication.OAuth",
"Microsoft.AspNetCore.Authentication.OpenIdConnect",
"Microsoft.AspNetCore.Authorization",
"Microsoft.AspNetCore.Authorization.Policy",
"Microsoft.AspNetCore.CookiePolicy",
"Microsoft.AspNetCore.Cors",
"Microsoft.AspNetCore.Cryptography.Internal",
"Microsoft.AspNetCore.Cryptography.KeyDerivation",
"Microsoft.AspNetCore.DataProtection",
"Microsoft.AspNetCore.DataProtection.Abstractions",
"Microsoft.AspNetCore.DataProtection.Extensions",
"Microsoft.AspNetCore.Diagnostics",
"Microsoft.AspNetCore.Diagnostics.HealthChecks",
"Microsoft.AspNetCore.HostFiltering",
"Microsoft.AspNetCore.Hosting",
"Microsoft.AspNetCore.Hosting.Abstractions",
"Microsoft.AspNetCore.Hosting.Server.Abstractions",
"Microsoft.AspNetCore.Http",
"Microsoft.AspNetCore.Http.Abstractions",
"Microsoft.AspNetCore.Http.Connections",
"Microsoft.AspNetCore.Http.Extensions",
"Microsoft.AspNetCore.Http.Features",
"Microsoft.AspNetCore.HttpOverrides",
"Microsoft.AspNetCore.HttpsPolicy",
"Microsoft.AspNetCore.Identity",
"Microsoft.AspNetCore.Localization",
"Microsoft.AspNetCore.Localization.Routing",
"Microsoft.AspNetCore.MiddlewareAnalysis",
"Microsoft.AspNetCore.Mvc",

// "Microsoft.AspNetCore.Mvc.Abstractions",
"Microsoft.AspNetCore.Mvc.Analyzers",
"Microsoft.AspNetCore.Mvc.ApiExplorer",
"Microsoft.AspNetCore.Mvc.Api.Analyzers",
"Microsoft.AspNetCore.Mvc.Core",
"Microsoft.AspNetCore.Mvc.Cors",
"Microsoft.AspNetCore.Mvc.DataAnnotations",
"Microsoft.AspNetCore.Mvc.Formatters.Json",
"Microsoft.AspNetCore.Mvc.Formatters.Xml",
"Microsoft.AspNetCore.Mvc.Localization",
"Microsoft.AspNetCore.Mvc.Razor",
"Microsoft.AspNetCore.Mvc.Razor.Extensions",
"Microsoft.AspNetCore.Mvc.Razor.ViewCompilation",
"Microsoft.AspNetCore.Mvc.RazorPages",
"Microsoft.AspNetCore.Mvc.TagHelpers",
"Microsoft.AspNetCore.Mvc.ViewFeatures",
"Microsoft.AspNetCore.Razor",
"Microsoft.AspNetCore.Razor.Runtime",
"Microsoft.AspNetCore.Razor.Design",
"Microsoft.AspNetCore.ResponseCaching",
"Microsoft.AspNetCore.ResponseCaching.Abstractions",
"Microsoft.AspNetCore.ResponseCompression",
"Microsoft.AspNetCore.Rewrite",
"Microsoft.AspNetCore.Routing",
"Microsoft.AspNetCore.Routing.Abstractions",
"Microsoft.AspNetCore.Server.HttpSys",
"Microsoft.AspNetCore.Server.IIS",
"Microsoft.AspNetCore.Server.IISIntegration",
"Microsoft.AspNetCore.Server.Kestrel",
"Microsoft.AspNetCore.Server.Kestrel.Core",
"Microsoft.AspNetCore.Server.Kestrel.Https",
"Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions",
"Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets",
"Microsoft.AspNetCore.Session",
"Microsoft.AspNetCore.SignalR",
"Microsoft.AspNetCore.SignalR.Core",
"Microsoft.AspNetCore.StaticFiles",
"Microsoft.AspNetCore.WebSockets",
"Microsoft.AspNetCore.WebUtilities",
"Microsoft.Net.Http.Headers"
};
// "Microsoft.AspNetCore.Mvc.Abstractions",
"Microsoft.AspNetCore.Mvc.Analyzers",
"Microsoft.AspNetCore.Mvc.ApiExplorer",
"Microsoft.AspNetCore.Mvc.Api.Analyzers",
"Microsoft.AspNetCore.Mvc.Core",
"Microsoft.AspNetCore.Mvc.Cors",
"Microsoft.AspNetCore.Mvc.DataAnnotations",
"Microsoft.AspNetCore.Mvc.Formatters.Json",
"Microsoft.AspNetCore.Mvc.Formatters.Xml",
"Microsoft.AspNetCore.Mvc.Localization",
"Microsoft.AspNetCore.Mvc.Razor",
"Microsoft.AspNetCore.Mvc.Razor.Extensions",
"Microsoft.AspNetCore.Mvc.Razor.ViewCompilation",
"Microsoft.AspNetCore.Mvc.RazorPages",
"Microsoft.AspNetCore.Mvc.TagHelpers",
"Microsoft.AspNetCore.Mvc.ViewFeatures",
"Microsoft.AspNetCore.Razor",
"Microsoft.AspNetCore.Razor.Runtime",
"Microsoft.AspNetCore.Razor.Design",
"Microsoft.AspNetCore.ResponseCaching",
"Microsoft.AspNetCore.ResponseCaching.Abstractions",
"Microsoft.AspNetCore.ResponseCompression",
"Microsoft.AspNetCore.Rewrite",
"Microsoft.AspNetCore.Routing",
"Microsoft.AspNetCore.Routing.Abstractions",
"Microsoft.AspNetCore.Server.HttpSys",
"Microsoft.AspNetCore.Server.IIS",
"Microsoft.AspNetCore.Server.IISIntegration",
"Microsoft.AspNetCore.Server.Kestrel",
"Microsoft.AspNetCore.Server.Kestrel.Core",
"Microsoft.AspNetCore.Server.Kestrel.Https",
"Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions",
"Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets",
"Microsoft.AspNetCore.Session",
"Microsoft.AspNetCore.SignalR",
"Microsoft.AspNetCore.SignalR.Core",
"Microsoft.AspNetCore.StaticFiles",
"Microsoft.AspNetCore.WebSockets",
"Microsoft.AspNetCore.WebUtilities",
"Microsoft.Net.Http.Headers"
];

public MustNotReferenceObsoleteAspNetPackages(ILogger<MustNotReferenceObsoleteAspNetPackages> logger)
: base(packageIds: PackageIds,
reason: "Obsoleted as direct reference with .net core 3.1 use the implicit reference through <Project Sdk=\"Microsoft.NET.Sdk.Web\">",
logger: logger)
: base(packageIds: PackageIds, reason: "Obsoleted as direct reference with .net core 3.1 use the implicit reference through <Project Sdk=\"Microsoft.NET.Sdk.Web\">", logger: logger)
{
}
}
2 changes: 1 addition & 1 deletion src/global.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.101",
"version": "8.0.200",
"allowPrerelease": false,
"rollForward": "latestPatch"
}
Expand Down

0 comments on commit 8b94007

Please sign in to comment.