Skip to content

Commit

Permalink
Merge pull request #1380 from dotnet/dev/vatsan/preview8-rel30-snap
Browse files Browse the repository at this point in the history
Preview 8 branch snap from master -> release/3.0
  • Loading branch information
vatsan-madhavan authored Jul 29, 2019
2 parents 76573a9 + 2c9fc2b commit 96a0732
Show file tree
Hide file tree
Showing 396 changed files with 4,282 additions and 7,234 deletions.
36 changes: 28 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,36 @@ variables:
_PublishUsingPipelines: true
_DotNetArtifactsCategory: WINDOWSDESKTOP

# This is set in the pipeline directly
# When set to false, CI tests will not be enabled in builds.
#
# _ContinuousIntegrationTestsEnabled: false

# Setting batch to true, triggers one build at a time.
# if there is a push while a build in progress, it will wait,
# until the running build finishes, and produce a build with all the changes
#
# only trigger ci builds for the master and release branches
trigger:
- master
- release/3.0
- arcade

# To be added in the future when VSTS supports this feature
# only trigger pull request builds for the master branch
# pr:
# - master
batch: true
branches:
include:
- master
- release/3.0
# - arcade
paths:
exclude:
- Documentation/*

pr:
autoCancel: true
branches:
include:
- master
- release/3.0
paths:
exclude:
- Documentation/*

# Call the pipeline.yml template, which does the real work
jobs:
Expand Down
104 changes: 52 additions & 52 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,111 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview7.19352.2">
<Dependency Name="Microsoft.Private.Winforms" Version="4.8.0-preview8.19379.9">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>52be7e5282560d26926a288d75a8489cd856ec4a</Sha>
<Sha>b0e49f17123cda852fecfc4610036f31de0d3b94</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.DirectoryServices" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.Emit" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.AccessControl" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27824-03" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-28379-03" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>e1d780539e85f4d8de263957715f9d08db2ceef4</Sha>
<Sha>915722554dc08a7075f89eddb40691caca23b6be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19326.23">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19378.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19326.23">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19378.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview7.19326.21">
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="4.8.0-preview8.19379.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>120e86951727331e5b899ed8b5b3b4ac35764b42</Sha>
<Sha>8248026ca9df8ba891de6de97b91779ecaa35983</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.IO.Packaging" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>468355e66daf9eaeb1978703fa6365cd1e37e644</Sha>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview7.19323.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview8.19372.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>8974a699899bdc2cc5687504e1ada606ac803e9b</Sha>
<Sha>c01a9a157d512343ef104bb2b1f97b356e708b11</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview7.19323.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="3.0.0-preview8.19372.4" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>8974a699899bdc2cc5687504e1ada606ac803e9b</Sha>
<Sha>c01a9a157d512343ef104bb2b1f97b356e708b11</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview7.19323.2" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview8.19372.4" CoherentParentDependency="Microsoft.NETCore.Runtime.CoreCLR">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>8974a699899bdc2cc5687504e1ada606ac803e9b</Sha>
<Sha>c01a9a157d512343ef104bb2b1f97b356e708b11</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19326.23">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19378.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19326.23">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19378.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19326.23">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19378.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>332e44d0a09e1c781c9bea9a48c07d0b0151d6c7</Sha>
<Sha>a8e982d3bac01d8f4f91a4c57191147570079448</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
55 changes: 30 additions & 25 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,47 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>4.8.0</VersionPrefix>
<PreReleaseVersionLabel>preview7</PreReleaseVersionLabel>
<PreReleaseVersionLabel>preview8</PreReleaseVersionLabel>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<SystemIOPackagingVersion>4.6.0-preview7.19320.1</SystemIOPackagingVersion>
<SystemIOPackagingVersion>4.6.0-preview8.19378.8</SystemIOPackagingVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>4.8.0-preview7.19352.2</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>4.8.0-preview8.19379.9</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-preview7.19323.2</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>3.0.0-preview7.19323.2</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>3.0.0-preview7.19323.2</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>3.0.0-preview8.19372.4</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>3.0.0-preview8.19372.4</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>3.0.0-preview8.19372.4</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppVersion>3.0.0-preview7-27824-03</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19320.1</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview7.19320.1</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview7.19320.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview7.19320.1</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppVersion>3.0.0-preview8-28379-03</MicrosoftNETCoreAppVersion>
<MicrosoftNETCorePlatformsVersion>3.0.0-preview8.19378.8</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>4.6.0-preview8.19378.8</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>4.6.0-preview8.19378.8</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>4.6.0-preview8.19378.8</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview7.19320.1</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview7.19320.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview7.19320.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview7.19320.1</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview7.19320.1</SystemReflectionEmitPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview8.19378.8</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview8.19378.8</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview8.19378.8</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>4.6.0-preview8.19378.8</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>4.6.0-preview8.19378.8</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview7.19320.1</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview7.19320.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview7.19320.1</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview7.19320.1</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview7.19320.1</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>4.6.0-preview8.19378.8</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview8.19378.8</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview8.19378.8</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview8.19378.8</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview8.19378.8</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19326.23</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19326.23</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19326.23</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19378.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19378.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19378.1</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
Expand All @@ -59,6 +59,11 @@
<XUnitVersion>2.4.0</XUnitVersion>
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
<XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
<!--
Also in global.json
Used in Wpf.Cpp.PrivateTools.props/targets
-->
<MsvcurtC1xxVersion>0.0.0.6</MsvcurtC1xxVersion>
<!--
This is the version of the test infrastructure package is compiled against. This should be
removed as part of https://github.com/dotnet/wpf/issues/816
Expand Down Expand Up @@ -107,6 +112,6 @@
It is worth reiterating that this package *should not* be consumed to build the product.
-->
<PropertyGroup>
<MicrosoftDotNetWpfDncEngVersion>4.8.0-preview7.19326.21</MicrosoftDotNetWpfDncEngVersion>
<MicrosoftDotNetWpfDncEngVersion>4.8.0-preview8.19379.4</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup>
</Project>
14 changes: 14 additions & 0 deletions eng/WpfArcadeSdk/Sdk/Sdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,20 @@
Suppress NU1605 (Package downgrade warnings) when building inside Visual Studio
-->
<NoWarn Condition="'$(BuildingInsideVisualStudio)'=='true'">$(NoWarn);NU1605</NoWarn>

<!--
Support for suppressing warnings by supplying /p:AdditionalNoWarn=0123;4567 from
dotnet.exe/msbuild commandline.
Helpful for debugging, and/or working through transient build problems, compiler issues etc.
Note that it is not possible to supply /p:NoWarn=0123;4567 successfully - this will cause the
<NoWarn>$(NoWarn);....</NoWarn> property specifications in projects/props/targets to be overridden
and ignored, in turn resulting in additional build-failures.
** Note**: AdditionalNoWarn should not be used in projects/props/targets.
-->
<NoWarn Condition="'$(AdditionalNoWarn)' != '' And '$(NoWarn)' != ''">$(AdditionalNoWarn);$(NoWarn)</NoWarn>
</PropertyGroup>

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

0 comments on commit 96a0732

Please # to comment.