Skip to content

Build on VS 2022 #5804

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

Closed
wants to merge 4 commits into from
Closed

Build on VS 2022 #5804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f5e521
Build on VS 2022
singhashish-wpf Dec 9, 2021
4c9fa6e
update vcruntime
singhashish-wpf Dec 9, 2021
40b48a2
Merge branch 'dotnet:main' into arcadebuild
singhashish-wpf Dec 10, 2021
af9ff74
Merge branch 'dotnet:main' into arcadebuild
singhashish-wpf Dec 10, 2021
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 @@ -73,7 +73,7 @@ stages:
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
demands: Build.Windows.Amd64.VS2022.Pre
# runAsPublic is used in expressions, which can't read from user-defined variables
runAsPublic: false

Expand Down
4 changes: 2 additions & 2 deletions eng/WpfArcadeSdk/tools/Wpf.Cpp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<VCProjectVersion>15.0</VCProjectVersion>
<CharacterSet>Unicode</CharacterSet>

<!-- v142 = Visual Studio 2019 -->
<PlatformToolset>v142</PlatformToolset>
<!-- v143 = Visual Studio 2022 -->
<PlatformToolset>v143</PlatformToolset>

<!-- 17134 is Windows 10 v1903 (19H1) SDK -->
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
Expand Down
4 changes: 2 additions & 2 deletions eng/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore1ESPool-Public
demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
variables:
# needed for signing
- name: _TeamName
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-rc.1.21430.12",
"dotnet": "6.0.100",
"runtimes": {
"dotnet": [
"2.1.7",
Expand All @@ -16,7 +16,7 @@
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2"
},
"sdk": {
"version": "6.0.100-rc.1.21430.12"
"version": "6.0.100"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(WpfCppProps)" />
<PropertyGroup>
<VCRedistCrtFolderName Condition="'$(Configuration)'=='Release'">Microsoft.VC142.CRT</VCRedistCrtFolderName>
<VCRedistCrtFolderName Condition="'$(Configuration)'=='Debug'">Microsoft.VC142.DebugCRT</VCRedistCrtFolderName>
<VCRedistCrtFolderName Condition="'$(Configuration)'=='Release'">Microsoft.VC143.CRT</VCRedistCrtFolderName>
Copy link
Contributor

@ThomasGoulet73 ThomasGoulet73 Dec 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the fallback still necessary ?

wpf/src/Microsoft.DotNet.Wpf/redist/VCRuntime/VCRuntime.vcxproj

Lines 38 to 42 in af9ff74

<!--
Remove these fallbacks after the build servers are guaranteed to have VC142
-->
<VCRedistFallbackCrtFolderName Condition="'$(Configuration)'=='Release'">Microsoft.VC141.CRT</VCRedistFallbackCrtFolderName>
<VCRedistFallbackCrtFolderName Condition="'$(Configuration)'=='Debug'">Microsoft.VC141.DebugCRT</VCRedistFallbackCrtFolderName>

It seems weird to fallback to VC141 when VC143 does not exist.

Copy link
Contributor Author

@singhashish-wpf singhashish-wpf Dec 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary @ThomasGoulet73
Will be removed.

Copy link
Contributor Author

@singhashish-wpf singhashish-wpf Dec 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ThomasGoulet73 #5810

<VCRedistCrtFolderName Condition="'$(Configuration)'=='Debug'">Microsoft.VC143.DebugCRT</VCRedistCrtFolderName>
<!--
Remove these fallbacks after the build servers are guaranteed to have VC142
-->
Expand Down Expand Up @@ -71,4 +71,4 @@
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>