Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nuget dependency #1036

Open
wants to merge 8 commits into
base: release/2.1
Choose a base branch
from
Open

Update nuget dependency #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d26f6ae
Update nuget
wtgodbe Nov 26, 2024
364908e
Update default-build.yml
wtgodbe Nov 26, 2024
ef86076
Update msbuild
wtgodbe Nov 26, 2024
6494588
Merge branch 'wtgodbe/FixNuget' of https://github.com/aspnet/BuildToo…
wtgodbe Nov 26, 2024
65d080e
Update TFM
wtgodbe Nov 26, 2024
12ce907
Fix it again tony
wtgodbe Nov 27, 2024
bd940e9
Update KoreBuild.Tasks.csproj
wtgodbe Dec 5, 2024
1a6d72e
Update KoreBuild.Tasks.Tests.csproj
wtgodbe Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .azure/templates/jobs/default-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
as long as the version we compile for is binary compatible with what the .NET Core SDK uses.
-->
<PropertyGroup>
<MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>16.8.0</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<Tooling_NewtonsoftJsonPackageVersion>9.0.1</Tooling_NewtonsoftJsonPackageVersion>
<Tooling_NuGetBuildTasksPackageVersion>4.7.0-netcore.2.1.preview2.5133</Tooling_NuGetBuildTasksPackageVersion>
<Tooling_NuGetBuildTasksPackageVersion>5.11.6</Tooling_NuGetBuildTasksPackageVersion>
</PropertyGroup>

<!-- These are set to flow into RepoTasks.csproj -->
Expand Down
2 changes: 1 addition & 1 deletion modules/KoreBuild.Tasks/KoreBuild.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net472</TargetFramework>
<AssemblyName>Internal.AspNetCore.KoreBuild.Tasks</AssemblyName>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>Internal.AspNetCore.SiteExtension.Sdk</PackageId>
<TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks>
<TargetFrameworks>net472</TargetFrameworks>
<Serviceable>false</Serviceable>
<Description>Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only.</Description>
<NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Internal.AspNetCore.SiteExtension.Sdk/Internal.AspNetCore.SiteExtension.Sdk.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<files>
<file src="_._" target="lib\netstandard1.0\_._" />
<file src="bin\$config$\netcoreapp2.1\Internal.AspNetCore.SiteExtension.Sdk.dll" target="tools\netcoreapp2.1\Internal.AspNetCore.SiteExtension.Sdk.dll" />
<file src="bin\$config$\net46\Internal.AspNetCore.SiteExtension.Sdk.dll" target="tools\net46\Internal.AspNetCore.SiteExtension.Sdk.dll" />
<file src="bin\$config$\net472\Internal.AspNetCore.SiteExtension.Sdk.dll" target="tools\net472\Internal.AspNetCore.SiteExtension.Sdk.dll" />
<file src="build\" target="build\" />
<file src="content\" target="content\" />
</files>
Expand Down
2 changes: 1 addition & 1 deletion test/KoreBuild.Tasks.Tests/KoreBuild.Tasks.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading