From d26f6ae92d2620e21416971f8e58134ffdf884e1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 26 Nov 2024 13:52:18 -0800 Subject: [PATCH 01/10] Update nuget --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index ad8dafe6..259e3e09 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -30,7 +30,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 9.0.1 - 4.7.0-netcore.2.1.preview2.5133 + 5.11.6 From 364908e45d2101a0e885dfdca495a5d90416c790 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 26 Nov 2024 14:27:35 -0800 Subject: [PATCH 02/10] Update default-build.yml --- .azure/templates/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/templates/jobs/default-build.yml b/.azure/templates/jobs/default-build.yml index d2160793..cdea997b 100644 --- a/.azure/templates/jobs/default-build.yml +++ b/.azure/templates/jobs/default-build.yml @@ -83,14 +83,14 @@ jobs: ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Internal ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc + name: NetCore-Svc-Public ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: image: windows.vs2019.amd64 os: windows ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Internal ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Svc + name: NetCore-Svc-Public variables: AgentOsName: ${{ parameters.agentOs }} ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping From ef86076b9c1dcb1a57f69f871e96092fbf574dc2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 26 Nov 2024 15:20:46 -0800 Subject: [PATCH 03/10] Update msbuild --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 259e3e09..889e548e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -25,7 +25,7 @@ as long as the version we compile for is binary compatible with what the .NET Core SDK uses. --> - 15.8.166 + 16.8.0 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) From 65d080e4f55cfd2c5f9a6cd46b712195cd1ed1d1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 26 Nov 2024 15:49:07 -0800 Subject: [PATCH 04/10] Update TFM --- .../Internal.AspNetCore.SiteExtension.Sdk.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj index 03164d8c..9048d24f 100644 --- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj +++ b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj @@ -2,7 +2,7 @@ Internal.AspNetCore.SiteExtension.Sdk - netcoreapp2.1;net46 + netcoreapp2.1;net472 false Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only. $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec From 12ce90711c24b10879ba7c689270d3245b2cb4d6 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 26 Nov 2024 16:17:57 -0800 Subject: [PATCH 05/10] Fix it again tony --- .../Internal.AspNetCore.SiteExtension.Sdk.csproj | 2 +- .../Internal.AspNetCore.SiteExtension.Sdk.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj index 9048d24f..6ee5017c 100644 --- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj +++ b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj @@ -2,7 +2,7 @@ Internal.AspNetCore.SiteExtension.Sdk - netcoreapp2.1;net472 + net472 false Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only. $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec index a6552123..4b628b0c 100644 --- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec +++ b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec @@ -11,7 +11,7 @@ - + From bd940e96742d886a0496d6b3f37594f8c6878f3d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 4 Dec 2024 17:23:12 -0800 Subject: [PATCH 06/10] Update KoreBuild.Tasks.csproj --- modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj b/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj index 6147092a..0e46f1eb 100644 --- a/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj +++ b/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net472 Internal.AspNetCore.KoreBuild.Tasks From 1a6d72eb8ec3e5fe630dd15fea0e2dbac9e4b028 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 4 Dec 2024 17:55:19 -0800 Subject: [PATCH 07/10] Update KoreBuild.Tasks.Tests.csproj --- test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj b/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj index 3a8903d1..4be7cd92 100644 --- a/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj +++ b/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1 + net472 From 0ceb26689b04e4bf9957c1e1db7f0933dda331e3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Sun, 26 Jan 2025 10:36:26 -0800 Subject: [PATCH 08/10] Downgrade --- build/dependencies.props | 4 ++-- modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj | 2 +- .../Internal.AspNetCore.SiteExtension.Sdk.csproj | 2 +- .../Internal.AspNetCore.SiteExtension.Sdk.nuspec | 2 +- test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 889e548e..f14747e6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -25,12 +25,12 @@ as long as the version we compile for is binary compatible with what the .NET Core SDK uses. --> - 16.8.0 + 15.8.166 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) 9.0.1 - 5.11.6 + 4.9.6 diff --git a/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj b/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj index 0e46f1eb..6147092a 100644 --- a/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj +++ b/modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj @@ -1,7 +1,7 @@ - net472 + netstandard2.0 Internal.AspNetCore.KoreBuild.Tasks diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj index 6ee5017c..03164d8c 100644 --- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj +++ b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj @@ -2,7 +2,7 @@ Internal.AspNetCore.SiteExtension.Sdk - net472 + netcoreapp2.1;net46 false Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only. $(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec index 4b628b0c..6dd3006c 100644 --- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec +++ b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec @@ -11,7 +11,7 @@ - + diff --git a/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj b/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj index 4be7cd92..3a8903d1 100644 --- a/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj +++ b/test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj @@ -1,7 +1,7 @@ - net472 + netcoreapp2.1 From 71d3343a4ae05ba13e56bd3775f9d5242b8787fd Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Sun, 26 Jan 2025 10:36:57 -0800 Subject: [PATCH 09/10] Fix --- .../Internal.AspNetCore.SiteExtension.Sdk.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec index 6dd3006c..a6552123 100644 --- a/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec +++ b/src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec @@ -11,7 +11,7 @@ - + From e7e9a3d376373f13259a2bdf42a0734a0b124485 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Sun, 26 Jan 2025 10:45:22 -0800 Subject: [PATCH 10/10] Remove unused file --- .../Internal/SimplePackageInstaller.cs | 91 ------------------- 1 file changed, 91 deletions(-) delete mode 100644 modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs diff --git a/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs b/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs deleted file mode 100644 index c9011c60..00000000 --- a/modules/KoreBuild.Tasks/Internal/SimplePackageInstaller.cs +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using NuGet.Commands; -using NuGet.Common; -using NuGet.DependencyResolver; -using NuGet.LibraryModel; -using NuGet.Packaging; -using NuGet.Packaging.Core; -using NuGet.Packaging.Signing; -using NuGet.Protocol.Core.Types; - -namespace KoreBuild.Tasks.Utilities -{ - internal class SimplePackageInstaller - { - private readonly string _packagesDirectory; - private readonly ILogger _logger; - private readonly SourceCacheContext _cacheContext; - private readonly int _maxDegreeOfConcurrency; - - public SimplePackageInstaller(string packageDir, SourceCacheContext cacheContext, bool disableParallel, ILogger logger) - { - _packagesDirectory = packageDir; - _cacheContext = cacheContext; - _logger = logger; - _maxDegreeOfConcurrency = disableParallel ? 1 : 16; - } - - public async Task InstallPackagesAsync(IEnumerable graphs, - HashSet allInstalledPackages, - CancellationToken token) - { - var packagesToInstall = graphs.SelectMany(g => g.Install.Where(match => allInstalledPackages.Add(match.Library))); - if (_maxDegreeOfConcurrency <= 1) - { - foreach (var match in packagesToInstall) - { - await InstallPackageAsync(match, token); - } - } - else - { - var bag = new ConcurrentBag(packagesToInstall); - var tasks = Enumerable.Range(0, _maxDegreeOfConcurrency) - .Select(async _ => - { - while (bag.TryTake(out RemoteMatch match)) - { - await InstallPackageAsync(match, token); - } - }); - await Task.WhenAll(tasks); - } - } - - private async Task InstallPackageAsync(RemoteMatch installItem, CancellationToken token) - { - var packageIdentity = new PackageIdentity(installItem.Library.Name, installItem.Library.Version); - - var verificationProviders = SignatureVerificationProviderFactory.GetSignatureVerificationProviders(); - var signedPackageVerifier = new PackageSignatureVerifier(verificationProviders, SignedPackageVerifierSettings.VerifyCommandDefaultPolicy); - - var versionFolderPathResolver = new VersionFolderPathResolver(_packagesDirectory); - var packageExtractionContext = new PackageExtractionContext( - PackageSaveMode.Defaultv3, - XmlDocFileSaveMode.None, - _logger, - signedPackageVerifier); - - using (var packageDependency = await installItem.Provider.GetPackageDownloaderAsync( - packageIdentity, - _cacheContext, - _logger, - token)) - { - await PackageExtractor.InstallFromSourceAsync( - packageIdentity, - packageDependency, - versionFolderPathResolver, - packageExtractionContext, - token); - } - } - } -}