Skip to content

Update SDK #435

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

Open
wtgodbe wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Update SDK #435

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
3492383
Update SDK
wtgodbe Sep 10, 2025
bf556e7
Update build image from VS2019 to VS2022
wtgodbe Sep 10, 2025
7cda649
Update Azure Pipelines image to Windows 2022
wtgodbe Sep 10, 2025
a759f13
Update build script to require VS2022 instead of VS2019
wtgodbe Sep 10, 2025
67e9298
Remove requirement for .NET 4.5 Targeting Pack
wtgodbe Dec 6, 2025
d8f67ef
Update to net452
wtgodbe Dec 6, 2025
b2482a7
370 failures last time
wtgodbe Dec 6, 2025
c4678a2
147 this time
wtgodbe Dec 6, 2025
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
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extends:
enabled: true
pool:
name: NetCore1ESPool-Svc-Internal
image: 1es-windows-2019
image: 1es-windows-2022
os: windows
stages:
- stage: build
Expand Down
7 changes: 3 additions & 4 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ mkdir bin

:Build

REM Require VS2019 (v16.0) on the system. Use `vswhere` for the search because it can find all VS installations.
REM Require VS2022 (v17.0) on the system. Use `vswhere` for the search because it can find all VS installations.
set vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
if not exist %vswhere% (
set vswhere="%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe"
Expand All @@ -23,16 +23,15 @@ if not exist %vswhere% (
)

set InstallDir=
for /f "usebackq tokens=*" %%i in (`%vswhere% -version 16 -latest -prerelease -products * ^
-requires Microsoft.Net.Component.4.5.TargetingPack ^
for /f "usebackq tokens=*" %%i in (`%vswhere% -version 17 -latest -prerelease -products * ^
-requires Microsoft.Net.Component.4.5.2.TargetingPack ^
-requires Microsoft.Net.Component.4.6.2.TargetingPack ^
-property installationPath`) do (
set "InstallDir=%%i"
)

if not DEFINED InstallDir (
echo "Could not find a VS2019 installation with the necessary components (targeting packs for v4.5, v4.5.2, and v4.6.2)."
echo "Could not find a VS2019 installation with the necessary components (targeting packs for v4.5.2 and v4.6.2)."
echo Please install VS2019 or the missing components.
goto BuildFail
)
Expand Down
2 changes: 1 addition & 1 deletion eng/templates/default-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
${{ if eq(variables['System.TeamProject'], 'public') }}:
pool:
name: NetCore-Svc-Public
demands: ImageOverride -equals windows.vs2019.amd64.open
demands: ImageOverride -equals windows.vs2022.amd64.open
timeoutInMinutes: 30

strategy:
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.405",
"version": "8.0.413",
"rollForward": "major"
}
}
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<PropertyGroup>
<IsPackable>true</IsPackable>
<IsTestProject>false</IsTestProject>
<TargetFrameworkVersion Condition=" !$(MSBuildProjectName.StartsWith('System.Net.Http.Formatting.ns')) ">v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion Condition=" !$(MSBuildProjectName.StartsWith('System.Net.Http.Formatting.ns')) ">v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<RunCodeAnalysis>$(CodeAnalysis)</RunCodeAnalysis>
<CodeAnalysisRuleSet>..\Strict.ruleset</CodeAnalysisRuleSet>
<DefineConstants>$(DefineConstants);ASPNETHTTPFORMATTING</DefineConstants>
<TargetFrameworkProfile Condition="'$(TargetFrameworkVersion)' != 'v4.5'">Client</TargetFrameworkProfile>
<TargetFrameworkProfile Condition="'$(TargetFrameworkVersion)' != 'v4.5.2'">Client</TargetFrameworkProfile>
<NoWarn>1591</NoWarn>
</PropertyGroup>

Expand Down
5 changes: 5 additions & 0 deletions test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<HintPath>..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="ChartTest.cs" />
Expand Down
1 change: 1 addition & 0 deletions test/System.Web.Helpers.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
<package id="xunit.extensibility.core" version="2.4.2" targetFramework="net462" />
<package id="xunit.extensibility.execution" version="2.4.2" targetFramework="net462" />
<package id="xunit.runner.visualstudio" version="2.4.5" targetFramework="net462" developmentDependency="true" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="netstandard2.0" />
</packages>
5 changes: 5 additions & 0 deletions test/System.Web.Mvc.Test/System.Web.Mvc.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
<HintPath>..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\AttributeListTest.cs">
Expand Down
1 change: 1 addition & 0 deletions test/System.Web.Mvc.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
<package id="xunit.extensibility.core" version="2.4.2" targetFramework="net462" />
<package id="xunit.extensibility.execution" version="2.4.2" targetFramework="net462" />
<package id="xunit.runner.visualstudio" version="2.4.5" targetFramework="net462" developmentDependency="true" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="netstandard2.0" />
</packages>
5 changes: 5 additions & 0 deletions test/System.Web.WebPages.Test/System.Web.WebPages.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@
<HintPath>..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\CollectionExtensionsTest.cs">
Expand Down
1 change: 1 addition & 0 deletions test/System.Web.WebPages.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
<package id="xunit.extensibility.core" version="2.4.2" targetFramework="net462" />
<package id="xunit.extensibility.execution" version="2.4.2" targetFramework="net462" />
<package id="xunit.runner.visualstudio" version="2.4.5" targetFramework="net462" developmentDependency="true" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="netstandard2.0" />
</packages>
Loading