Skip to content

Commit 0a13e75

Browse files
vatsan-madhavanvatsan-madhavan
committed
Merge branch 'master' into dev/vatsan/preview8-rel30-snap
2 parents 76573a9 + 457a271 commit 0a13e75

File tree

386 files changed

+4015
-7161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

386 files changed

+4015
-7161
lines changed

‎azure-pipelines.yml‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,36 @@ variables:
1414
_PublishUsingPipelines: true
1515
_DotNetArtifactsCategory: WINDOWSDESKTOP
1616

17+
# This is set in the pipeline directly
18+
# When set to false, CI tests will not be enabled in builds.
19+
#
20+
# _ContinuousIntegrationTestsEnabled: false
21+
22+
# Setting batch to true, triggers one build at a time.
23+
# if there is a push while a build in progress, it will wait,
24+
# until the running build finishes, and produce a build with all the changes
25+
#
1726
# only trigger ci builds for the master and release branches
1827
trigger:
19-
- master
20-
- release/3.0
21-
- arcade
22-
23-
# To be added in the future when VSTS supports this feature
24-
# only trigger pull request builds for the master branch
25-
# pr:
26-
# - master
28+
batch: true
29+
branches:
30+
include:
31+
- master
32+
- release/3.0
33+
# - arcade
34+
paths:
35+
exclude:
36+
- Documentation/*
37+
38+
pr:
39+
autoCancel: true
40+
branches:
41+
include:
42+
- master
43+
- release/3.0
44+
paths:
45+
exclude:
46+
- Documentation/*
2747

2848
# Call the pipeline.yml template, which does the real work
2949
jobs:

‎eng/Version.Details.xml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,111 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview7.19352.2">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview8.19374.7">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>52be7e5282560d26926a288d75a8489cd856ec4a</Sha>
6+
<Sha>f18f93d0163a3cca64634b6c7c424833b1659be0</Sha>
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
10+
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
1111
<Uri>https://github.com/dotnet/corefx</Uri>
12-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
12+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
1313
</Dependency>
14-
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
14+
<Dependency Name="System.CodeDom" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
1515
<Uri>https://github.com/dotnet/corefx</Uri>
16-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
16+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
1717
</Dependency>
18-
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
18+
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
1919
<Uri>https://github.com/dotnet/corefx</Uri>
20-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
20+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
2121
</Dependency>
22-
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
22+
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
2323
<Uri>https://github.com/dotnet/corefx</Uri>
24-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
24+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
2525
</Dependency>
26-
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
26+
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
2727
<Uri>https://github.com/dotnet/corefx</Uri>
28-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
28+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
2929
</Dependency>
30-
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
30+
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
3131
<Uri>https://github.com/dotnet/corefx</Uri>
32-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
32+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
3333
</Dependency>
34-
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
34+
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
3535
<Uri>https://github.com/dotnet/corefx</Uri>
36-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
36+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
3737
</Dependency>
38-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
3939
<Uri>https://github.com/dotnet/corefx</Uri>
40-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
40+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
4141
</Dependency>
42-
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
42+
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
4343
<Uri>https://github.com/dotnet/corefx</Uri>
44-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
44+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
4545
</Dependency>
46-
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
46+
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
4747
<Uri>https://github.com/dotnet/corefx</Uri>
48-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
48+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
4949
</Dependency>
50-
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
50+
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
5151
<Uri>https://github.com/dotnet/corefx</Uri>
52-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
52+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
5353
</Dependency>
54-
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
54+
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
5555
<Uri>https://github.com/dotnet/corefx</Uri>
56-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
56+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
5757
</Dependency>
58-
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
58+
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
5959
<Uri>https://github.com/dotnet/corefx</Uri>
60-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
60+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27824-03" CoherentParentDependency="Microsoft.Private.Winforms">
62+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-28373-17" CoherentParentDependency="Microsoft.Private.Winforms">
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
64-
<Sha>e1d780539e85f4d8de263957715f9d08db2ceef4</Sha>
64+
<Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19326.23">
66+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19375.2">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
68+
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19326.23">
70+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19375.2">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
72+
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
74+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
76-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
76+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19326.21">
78+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview8.19373.14">
7979
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
80-
<Sha>120e86951727331e5b899ed8b5b3b4ac35764b42</Sha>
80+
<Sha>d6cdc6daf9ddfeee3731ca75c8205589195d7adb</Sha>
8181
</Dependency>
82-
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
82+
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview8.19372.8" CoherentParentDependency="Microsoft.NETCore.App">
8383
<Uri>https://github.com/dotnet/corefx</Uri>
84-
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
84+
<Sha>d594cb2dbc5027d7e996491b0722c5be5204460f</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19323.2" CoherentParentDependency="Microsoft.NETCore.App">
86+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview8.19372.4" CoherentParentDependency="Microsoft.NETCore.App">
8787
<Uri>https://github.com/dotnet/coreclr</Uri>
88-
<Sha>8974a699899bdc2cc5687504e1ada606ac803e9b</Sha>
88+
<Sha>c01a9a157d512343ef104bb2b1f97b356e708b11</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview7.19323.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
90+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview8.19372.4" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
9191
<Uri>https://github.com/dotnet/coreclr</Uri>
92-
<Sha>8974a699899bdc2cc5687504e1ada606ac803e9b</Sha>
92+
<Sha>c01a9a157d512343ef104bb2b1f97b356e708b11</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview7.19323.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
94+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview8.19372.4" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
9595
<Uri>https://github.com/dotnet/coreclr</Uri>
96-
<Sha>8974a699899bdc2cc5687504e1ada606ac803e9b</Sha>
96+
<Sha>c01a9a157d512343ef104bb2b1f97b356e708b11</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19326.23">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19375.2">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
100+
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19326.23">
102+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19375.2">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
104+
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19326.23">
106+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19375.2">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
108+
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
109109
</Dependency>
110110
</ToolsetDependencies>
111111
</Dependencies>

‎eng/Versions.props‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,47 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<VersionPrefix>4.8.0</VersionPrefix>
5-
<PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
5+
<PreReleaseVersionLabel>preview8</PreReleaseVersionLabel>
66
<AssemblyVersion>4.0.0.0</AssemblyVersion>
7-
<SystemIOPackagingVersion>4.6.0-preview7.19320.1</SystemIOPackagingVersion>
7+
<SystemIOPackagingVersion>4.6.0-preview8.19372.8</SystemIOPackagingVersion>
88
</PropertyGroup>
99
<!-- NuGet Package Versions -->
1010
<PropertyGroup>
11-
<MicrosoftPrivateWinformsVersion>4.8.0-preview7.19352.2</MicrosoftPrivateWinformsVersion>
11+
<MicrosoftPrivateWinformsVersion>4.8.0-preview8.19374.7</MicrosoftPrivateWinformsVersion>
1212
</PropertyGroup>
1313
<!-- Packages that come from https://github.com/dotnet/coreclr -->
1414
<PropertyGroup>
15-
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-preview7.19323.2</MicrosoftNETCoreRuntimeCoreCLRVersion>
16-
<MicrosoftNETCoreILDAsmVersion>3.0.0-preview7.19323.2</MicrosoftNETCoreILDAsmVersion>
17-
<MicrosoftNETCoreILAsmVersion>3.0.0-preview7.19323.2</MicrosoftNETCoreILAsmVersion>
15+
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-preview8.19372.4</MicrosoftNETCoreRuntimeCoreCLRVersion>
16+
<MicrosoftNETCoreILDAsmVersion>3.0.0-preview8.19372.4</MicrosoftNETCoreILDAsmVersion>
17+
<MicrosoftNETCoreILAsmVersion>3.0.0-preview8.19372.4</MicrosoftNETCoreILAsmVersion>
1818
</PropertyGroup>
1919
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2020
<PropertyGroup>
21-
<MicrosoftNETCoreAppVersion>3.0.0-preview7-27824-03</MicrosoftNETCoreAppVersion>
22-
<MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19320.1</MicrosoftNETCorePlatformsVersion>
23-
<SystemDrawingCommonVersion>4.6.0-preview7.19320.1</SystemDrawingCommonVersion>
24-
<SystemDirectoryServicesVersion>4.6.0-preview7.19320.1</SystemDirectoryServicesVersion>
25-
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19320.1</SystemReflectionMetadataLoadContextVersion>
21+
<MicrosoftNETCoreAppVersion>3.0.0-preview8-28373-17</MicrosoftNETCoreAppVersion>
22+
<MicrosoftNETCorePlatformsVersion>3.0.0-preview8.19372.8</MicrosoftNETCorePlatformsVersion>
23+
<SystemDrawingCommonVersion>4.6.0-preview8.19372.8</SystemDrawingCommonVersion>
24+
<SystemDirectoryServicesVersion>4.6.0-preview8.19372.8</SystemDirectoryServicesVersion>
25+
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview8.19372.8</SystemReflectionMetadataLoadContextVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
2828
<PropertyGroup>
29-
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19320.1</MicrosoftWin32RegistryPackageVersion>
30-
<SystemCodeDomPackageVersion>4.6.0-preview7.19320.1</SystemCodeDomPackageVersion>
31-
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19320.1</SystemConfigurationConfigurationManagerPackageVersion>
32-
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19320.1</SystemDiagnosticsEventLogPackageVersion>
33-
<SystemReflectionEmitPackageVersion>4.6.0-preview7.19320.1</SystemReflectionEmitPackageVersion>
29+
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview8.19372.8</MicrosoftWin32RegistryPackageVersion>
30+
<SystemCodeDomPackageVersion>4.6.0-preview8.19372.8</SystemCodeDomPackageVersion>
31+
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview8.19372.8</SystemConfigurationConfigurationManagerPackageVersion>
32+
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview8.19372.8</SystemDiagnosticsEventLogPackageVersion>
33+
<SystemReflectionEmitPackageVersion>4.6.0-preview8.19372.8</SystemReflectionEmitPackageVersion>
3434
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
35-
<SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19320.1</SystemSecurityAccessControlPackageVersion>
36-
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19320.1</SystemSecurityCryptographyXmlPackageVersion>
37-
<SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19320.1</SystemSecurityPermissionsPackageVersion>
38-
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19320.1</SystemSecurityPrincipalWindowsPackageVersion>
39-
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19320.1</SystemWindowsExtensionsPackageVersion>
35+
<SystemSecurityAccessControlPackageVersion>4.6.0-preview8.19372.8</SystemSecurityAccessControlPackageVersion>
36+
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview8.19372.8</SystemSecurityCryptographyXmlPackageVersion>
37+
<SystemSecurityPermissionsPackageVersion>4.6.0-preview8.19372.8</SystemSecurityPermissionsPackageVersion>
38+
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview8.19372.8</SystemSecurityPrincipalWindowsPackageVersion>
39+
<SystemWindowsExtensionsPackageVersion>4.6.0-preview8.19372.8</SystemWindowsExtensionsPackageVersion>
4040
</PropertyGroup>
4141
<!-- Packages that come from https://github.com/dotnet/arcade -->
4242
<PropertyGroup>
43-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19326.23</MicrosoftDotNetApiCompatVersion>
44-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19326.23</MicrosoftDotNetCodeAnalysisPackageVersion>
45-
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19326.23</MicrosoftDotNetGenAPIVersion>
43+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19375.2</MicrosoftDotNetApiCompatVersion>
44+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19375.2</MicrosoftDotNetCodeAnalysisPackageVersion>
45+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19375.2</MicrosoftDotNetGenAPIVersion>
4646
</PropertyGroup>
4747
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
4848
<PropertyGroup>
@@ -59,6 +59,11 @@
5959
<XUnitVersion>2.4.0</XUnitVersion>
6060
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
6161
<XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
62+
<!--
63+
Also in global.json
64+
Used in Wpf.Cpp.PrivateTools.props/targets
65+
-->
66+
<MsvcurtC1xxVersion>0.0.0.6</MsvcurtC1xxVersion>
6267
<!--
6368
This is the version of the test infrastructure package is compiled against. This should be
6469
removed as part of https://github.com/dotnet/wpf/issues/816
@@ -107,6 +112,6 @@
107112
It is worth reiterating that this package *should not* be consumed to build the product.
108113
-->
109114
<PropertyGroup>
110-
<MicrosoftDotNetWpfDncEngVersion>4.8.0-preview7.19326.21</MicrosoftDotNetWpfDncEngVersion>
115+
<MicrosoftDotNetWpfDncEngVersion>4.8.0-preview8.19373.14</MicrosoftDotNetWpfDncEngVersion>
111116
</PropertyGroup>
112117
</Project>

‎eng/WpfArcadeSdk/Sdk/Sdk.props‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,20 @@
6868
Suppress NU1605 (Package downgrade warnings) when building inside Visual Studio
6969
-->
7070
<NoWarn Condition="'$(BuildingInsideVisualStudio)'=='true'">$(NoWarn);NU1605</NoWarn>
71+
72+
<!--
73+
Support for suppressing warnings by supplying /p:AdditionalNoWarn=0123;4567 from
74+
dotnet.exe/msbuild commandline.
75+
76+
Helpful for debugging, and/or working through transient build problems, compiler issues etc.
77+
78+
Note that it is not possible to supply /p:NoWarn=0123;4567 successfully - this will cause the
79+
<NoWarn>$(NoWarn);....</NoWarn> property specifications in projects/props/targets to be overridden
80+
and ignored, in turn resulting in additional build-failures.
81+
82+
** Note**: AdditionalNoWarn should not be used in projects/props/targets.
83+
-->
84+
<NoWarn Condition="'$(AdditionalNoWarn)' != '' And '$(NoWarn)' != ''">$(AdditionalNoWarn);$(NoWarn)</NoWarn>
7185
</PropertyGroup>
7286

7387
<!-- When an Sdk-style project sets NoTargets=true, it will produce no assemblies -->

0 commit comments

Comments
 (0)