Skip to content

[main] Source code updates from dotnet/dotnet #11023

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

Merged
merged 12 commits into from
Aug 11, 2025
Merged

[main] Source code updates from dotnet/dotnet #11023

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b330ff9
Backflow from https://github.com/dotnet/dotnet / 8b29a16 build 277635
dotnet-maestro[bot] Aug 1, 2025
dca0d08
Update dependencies from https://github.com/dotnet/dotnet build 277635
dotnet-maestro[bot] Aug 1, 2025
f6fa723
Editor whitespace allignments
harshit7962 Aug 4, 2025
b96630f
Fix Validation merge policy flags
harshit7962 Aug 4, 2025
299a4e2
Second iteration on fixing validation merge policy violation
harshit7962 Aug 4, 2025
2291e73
Update dependencies from https://github.com/dotnet/dotnet build 278022
dotnet-maestro[bot] Aug 6, 2025
93b4cb1
Update dependencies from https://github.com/dotnet/dotnet build 278224
dotnet-maestro[bot] Aug 7, 2025
cbb7499
Update dependencies from https://github.com/dotnet/dotnet build 278405
dotnet-maestro[bot] Aug 8, 2025
d4fbd7e
Update dependencies from https://github.com/dotnet/dotnet build 278512
dotnet-maestro[bot] Aug 9, 2025
8d7881c
Update dependencies from https://github.com/dotnet/dotnet build 278626
dotnet-maestro[bot] Aug 11, 2025
396dd25
Pinning the back version of MicrosoftSourceLinkGithubPackageVersion
harshit7962 Aug 11, 2025
f8582bb
Correctly pin sourcelink dependencies
ViktorHofer Aug 11, 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
66 changes: 65 additions & 1 deletion eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,65 @@
<!-- will get filled in the next backflow -->
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is auto-generated by the Maestro dependency flow system.
Do not edit it manually, as it will get overwritten by automation.
This file should be imported by eng/Versions.props
-->
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25401.103</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25401.103</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25401.103</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25401.103</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25401.103</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25401.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25401.103</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25401.103</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>10.0.0-beta.25401.103</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>10.0.0-beta.25401.103</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25401.103</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25401.103</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25401.103</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25401.103</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25401.103</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25401.103</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25401.103</SystemIOPackagingPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25401.103</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25401.103</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25401.103</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25401.103</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25401.103</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25401.103</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-preview.7.25317.2</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetCodeAnalysisVersion>$(MicrosoftDotNetCodeAnalysisPackageVersion)</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>$(MicrosoftDotNetGenAPIPackageVersion)</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCorePlatformsVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETCorePlatformsVersion>
<MicrosoftPrivateWinformsVersion>$(MicrosoftPrivateWinformsPackageVersion)</MicrosoftPrivateWinformsVersion>
<MicrosoftSourceLinkAzureReposGitVersion>$(MicrosoftSourceLinkAzureReposGitPackageVersion)</MicrosoftSourceLinkAzureReposGitVersion>
<MicrosoftSourceLinkGitHubVersion>$(MicrosoftSourceLinkGitHubPackageVersion)</MicrosoftSourceLinkGitHubVersion>
<SystemCodeDomVersion>$(SystemCodeDomPackageVersion)</SystemCodeDomVersion>
<SystemConfigurationConfigurationManagerVersion>$(SystemConfigurationConfigurationManagerPackageVersion)</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>$(SystemDiagnosticsEventLogPackageVersion)</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesVersion>$(SystemDirectoryServicesPackageVersion)</SystemDirectoryServicesVersion>
<SystemDrawingCommonVersion>$(SystemDrawingCommonPackageVersion)</SystemDrawingCommonVersion>
<SystemFormatsNrbfVersion>$(SystemFormatsNrbfPackageVersion)</SystemFormatsNrbfVersion>
<SystemIOPackagingVersion>$(SystemIOPackagingPackageVersion)</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>$(SystemReflectionMetadataLoadContextPackageVersion)</SystemReflectionMetadataLoadContextVersion>
<SystemResourcesExtensionsVersion>$(SystemResourcesExtensionsPackageVersion)</SystemResourcesExtensionsVersion>
<SystemRuntimeSerializationFormattersVersion>$(SystemRuntimeSerializationFormattersPackageVersion)</SystemRuntimeSerializationFormattersVersion>
<SystemSecurityCryptographyXmlVersion>$(SystemSecurityCryptographyXmlPackageVersion)</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>$(SystemSecurityPermissionsPackageVersion)</SystemSecurityPermissionsVersion>
<SystemWindowsExtensionsVersion>$(SystemWindowsExtensionsPackageVersion)</SystemWindowsExtensionsVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngVersion>$(MicrosoftDotNetWpfDncEngPackageVersion)</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup>
</Project>
94 changes: 47 additions & 47 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,104 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="6a953e76162f3f079405f80e28664fa51b136740" BarId="276981" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="8b29a1682219da555ee27e4fdda55dc3884b316f" BarId="277635" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-preview.7.25377.103">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-preview.7.25377.103">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.7.25377.103">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.7.25317.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>8a6c1d81657ef04c040f598cafacf8f5a33abda2</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25377.103">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-preview.7.25377.103">
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25377.103">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25377.103">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25377.103">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25377.103">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25377.103">
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="10.0.0-beta.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25377.103">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="10.0.0-beta.25401.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>6a953e76162f3f079405f80e28664fa51b136740</Sha>
<Sha>8b29a1682219da555ee27e4fdda55dc3884b316f</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.100-preview.7.25322.101",
"version": "10.0.100-preview.7.25372.107",
"allowPrerelease": true,
"rollForward": "latestFeature",
"paths": [
Expand All @@ -10,7 +10,7 @@
"errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
},
"tools": {
"dotnet": "10.0.100-preview.7.25322.101",
"dotnet": "10.0.100-preview.7.25372.107",
"runtimes": {
"dotnet/x64": [
"$(MicrosoftNETCorePlatformsVersion)"
Expand All @@ -24,8 +24,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25401.103",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25401.103",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down
27 changes: 7 additions & 20 deletions ...rosoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/MarkupCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,28 +550,18 @@ private void _Compile(string relativeSourceFile, bool pass2)
xamlParser.BamlRecordWriter == null &&
IsBamlNeeded)
{
if (_pendingLocalFiles == null)
{
_pendingLocalFiles = new ArrayList(10);
}
_pendingLocalFiles ??= new ArrayList(10);

_pendingLocalFiles.Add(relativeSourceFile);
}

if (_codeContexts != null)
{
_codeContexts.Clear();
_codeContexts = null;
}
_codeContexts?.Clear();
_codeContexts = null;


SourceFileInfo?.CloseStream();

if (bamlStream != null)
{
bamlStream.Close();
bamlStream = null;
}
bamlStream?.Close();
bamlStream = null;
}
}

Expand All @@ -597,11 +587,8 @@ private void GenerateSource()
_ccRoot.CodeNS.Types.Add(_ccRoot.CodeClass);
}

if (_usingNS != null)
{
_usingNS.Clear();
_usingNS = null;
}
_usingNS?.Clear();
_usingNS = null;

if (IsCompilingEntryPointClass)
{
Expand Down
8 changes: 2 additions & 6 deletions ...osoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/MarkupCompiler/ParserExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,12 +676,8 @@ public override void WriteEndAttributes(XamlEndAttributesNode xamlEndAttributesN
_compiler.ConnectNameAndEvents(_name, _events, _connectionId);

_name = null;

if (_events != null)
{
_events.Clear();
_events = null;
}
_events?.Clear();
_events = null;
}
else
{
Expand Down
7 changes: 2 additions & 5 deletions src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Shared/SourceFileInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,8 @@ internal Stream Stream
//
internal void CloseStream()
{
if (_stream != null)
{
_stream.Close();
_stream = null;
}
_stream?.Close();
_stream = null;
}

#endregion
Expand Down
9 changes: 3 additions & 6 deletions ...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,8 @@ protected override void Dispose(bool disposing)
{
if (disposing)
{
if (null != _sourceStream)
{
_sourceStream.Dispose();
_sourceStream = null;
}
_sourceStream?.Dispose();
_sourceStream = null;
}
}
}
Expand Down Expand Up @@ -153,7 +150,7 @@ public override bool Execute()
return false;
}

if (OutputResourcesFile != null && OutputResourcesFile.Length > 1)
if (OutputResourcesFile?.Length > 1)
{
// Every task should generate only one .resources.
Log.LogErrorWithCodeFromResources(nameof(SR.MoreResourcesFiles));
Expand Down
Loading