Skip to content

Commit e25cd6b

Browse files
ryalanmsryalanms
authored
[netcore3] Open source PresentationBuildTasks (#504)
* Add files needed for PresentationBuildTasks * Synchronize files * Adding PresentationCore files * Add <Link> tags to organize csproj * Add README files * Add WindowsDesktop Sdk project files * Add WindowsDesktop Sdk to solution * PresentationBuildTasks: PoliCheck, sss.exe (sanitize), and codeformatter with customer rules + manual scrub for aliases, bugs, todos * Update ShippingProjects.props * Add changes to contribution.md with info about analyzers * Update README.md's for shared files
1 parent 14ce917 commit e25cd6b

File tree

110 files changed

+72174
-227
lines changed

Some content is hidden

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

110 files changed

+72174
-227
lines changed

‎Documentation/contributing.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ See [Developer Guide](developer-guide.md) to learn how to develop changes for th
1313

1414
This project follows the general [.NET Core Contribution Guidelines](https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/contributing.md). The contribution bar from the general contribution guidelines is copied below.
1515

16-
## Do not change files in the `Shared` directory
16+
## Do not change files in the `Shared`, `WindowsBase`, `PresentationCore`, and `PresentationFramework` directories
1717

18-
The directory [`src/Microsoft.DotNet.Wpf/src/Shared`](https://github.com/dotnet/wpf/tree/master/src/Microsoft.DotNet.Wpf/src/Shared) contains files that are shared between the public GitHub repo and the internal WPF repos. Changes to files in this directory will *not* be accepted since they also affect internal code. Once all the appropriate source has been published to the public repo, this restriction will no longer be needed.
18+
The directories [`src/Microsoft.DotNet.Wpf/src/Shared`](https://github.com/dotnet/wpf/tree/master/src/Microsoft.DotNet.Wpf/src/Shared), [`src/Microsoft.DotNet.Wpf/src/WindowsBase`](https://github.com/dotnet/wpf/tree/master/src/Microsoft.DotNet.Wpf/src/WindowsBase), [`src/Microsoft.DotNet.Wpf/src/PresentationCore`](https://github.com/dotnet/wpf/tree/master/src/Microsoft.DotNet.Wpf/src/PresentationCore), [`src/Microsoft.DotNet.Wpf/src/PresentationFramework`](https://github.com/dotnet/wpf/tree/master/src/Microsoft.DotNet.Wpf/src/PresentationFramework) contains files that are shared between the public GitHub repo and the internal WPF repos. Changes to files in this directory will *not* be accepted since they also affect internal code. Once all the appropriate sources have been published to the public repo, this restriction will no longer be needed.
1919

2020
## Contribution "Bar"
2121

@@ -26,3 +26,13 @@ Maintainers will not merge changes that have narrowly-defined benefits due to co
2626
Most .NET Core components are cross-platform and we appreciate contributions that either improve their feature set in a given environment or that add support for a new environment. We will typically not accept contributions that implement support for an OS-specific technolology on another operating system. For example, we do not intend to create an implementation of the Windows registry for Linux or an implementation of the macOS keychain for Windows. We also do not intend to accept contributions that provide cross-platform implementations for Windows Forms or WPF.
2727

2828
Contributions must also satisfy the other published guidelines defined in this document.
29+
30+
## Code Formatting Improvements and Minor Enhancements
31+
32+
We will consider code-formatting improvements that are identified by running code analyzers.
33+
34+
Our CodeAnalysis rules are not enabled by default. These can be enabled by setting the MSBuild property `EnableAnalyzers=true` (in commandline, it is set as `/p:EnableAnalyzers=true`).
35+
36+
The code analyzer would likely recommend changes that can result in changes to the generated IL. In general, we prefer code-formatting PR's to be limited to changes that do not have any impact on the IL - these are easier to review and approve and do not require additional testing.
37+
38+
Please open issues for changes that affect the IL or might require additional validation, and work with the project maintainers to determine whether a PR would be appropriate.

‎Microsoft.Dotnet.Wpf.sln

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Arcade.Wpf
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral", "packaging\Microsoft.Dotnet.Wpf.ProjectTemplates\Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj", "{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}"
2121
EndProject
22-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf.ProjectTemplates", "Microsoft.DotNet.Wpf.ProjectTemplates", "{891FF487-721B-4935-833A-F9ABFEB1E79D}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationBuildTasks", "src\Microsoft.DotNet.Wpf\src\PresentationBuildTasks\PresentationBuildTasks.csproj", "{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}"
23+
EndProject
24+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.NET.Sdk.WindowsDesktop", "Microsoft.NET.Sdk.WindowsDesktop", "{1D4C8AD7-12E7-4987-98AF-AEE79F53E494}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral", "packaging\Microsoft.NET.Sdk.WindowsDesktop\Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj", "{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}"
27+
EndProject
28+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf.ProjectTemplates", "Microsoft.DotNet.Wpf.ProjectTemplates", "{22D643D8-87D6-4FE8-9632-58A3CD3DC7CB}"
2329
EndProject
2430
Global
2531
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -91,6 +97,30 @@ Global
9197
{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}.Release|x64.Build.0 = Release|x64
9298
{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}.Release|x86.ActiveCfg = Release|Any CPU
9399
{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}.Release|x86.Build.0 = Release|Any CPU
100+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
101+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
102+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x64.ActiveCfg = Debug|x64
103+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x64.Build.0 = Debug|x64
104+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x86.ActiveCfg = Debug|Any CPU
105+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Debug|x86.Build.0 = Debug|Any CPU
106+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
107+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|Any CPU.Build.0 = Release|Any CPU
108+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x64.ActiveCfg = Release|x64
109+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x64.Build.0 = Release|x64
110+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x86.ActiveCfg = Release|Any CPU
111+
{4216C2EA-E2B9-4FB2-9803-F73FDC64CAC4}.Release|x86.Build.0 = Release|Any CPU
112+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
113+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
114+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|x64.ActiveCfg = Debug|x64
115+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|x64.Build.0 = Debug|x64
116+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|x86.ActiveCfg = Debug|Any CPU
117+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Debug|x86.Build.0 = Debug|Any CPU
118+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
119+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|Any CPU.Build.0 = Release|Any CPU
120+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|x64.ActiveCfg = Release|x64
121+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|x64.Build.0 = Release|x64
122+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|x86.ActiveCfg = Release|Any CPU
123+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1}.Release|x86.Build.0 = Release|Any CPU
94124
EndGlobalSection
95125
GlobalSection(SolutionProperties) = preSolution
96126
HideSolutionNode = FALSE
@@ -101,8 +131,10 @@ Global
101131
{9A7E395B-E859-40E2-809D-EFB72CF3A2EE} = {BF20132A-191F-4D34-9A1B-831772A6DFCF}
102132
{8A2ABE39-2D50-48CA-AC32-078BBA32757A} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
103133
{B73BB4AB-68DE-4B91-BBB0-AB4F2D504AC3} = {8A2ABE39-2D50-48CA-AC32-078BBA32757A}
104-
{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0} = {891FF487-721B-4935-833A-F9ABFEB1E79D}
105-
{891FF487-721B-4935-833A-F9ABFEB1E79D} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
134+
{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0} = {22D643D8-87D6-4FE8-9632-58A3CD3DC7CB}
135+
{1D4C8AD7-12E7-4987-98AF-AEE79F53E494} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
136+
{440D06B8-E3DE-4C0D-AD25-CD4F43D836E1} = {1D4C8AD7-12E7-4987-98AF-AEE79F53E494}
137+
{22D643D8-87D6-4FE8-9632-58A3CD3DC7CB} = {0159B0F1-0626-4BED-8D1B-CBFF4F12C369}
106138
EndGlobalSection
107139
GlobalSection(ExtensibilityGlobals) = postSolution
108140
SolutionGuid = {D4D12991-F531-4FC3-849D-29946BCA818A}

‎eng/WpfArcadeSdk/tools/ShippingProjects.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
33
<ExternalShippingProjects>
4-
System.Xaml
4+
System.Xaml;
5+
PresentationBuildTasks
56
</ExternalShippingProjects>
67

78
<InternalShippingProjects>
8-
PresentationBuildTasks;
99
PresentationCore;
1010
DirectWriteForwarder;
1111
PresentationCore-CommonResources;

‎packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<ProjectGuid>{440d06b8-e3de-4c0d-ad25-cd4f43d836e1}</ProjectGuid>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<Platforms>AnyCPU;x64</Platforms>
6+
<IsShippingPackage>true</IsShippingPackage>
7+
<VersionPrefix>3.0.0</VersionPrefix>
8+
</PropertyGroup>
9+
10+
<PropertyGroup>
11+
<!--
12+
PlatformIndependentPackage = true means that this package does
13+
not require the automatic generation of a runtime.json file using
14+
the Bait & Switch technique to reference RID specific packages
15+
-->
16+
<PlatformIndependentPackage>true</PlatformIndependentPackage>
17+
</PropertyGroup>
18+
19+
<PropertyGroup>
20+
<PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))</PackageName>
21+
<AssemblyName>$(PackageName</AssemblyName>
22+
<PackageDescription>WindowsDesktop SDK</PackageDescription>
23+
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<PackagingContent Include="Sdk\*" SubFolder="root\Sdk" />
27+
<PackagingContent Include="targets\*" SubFolder="root\targets" />
28+
<PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
29+
</ItemGroup>
30+
</Project>

‎packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.props

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<!--
2+
***********************************************************************************************
3+
Sdk.props
4+
5+
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
6+
created a backup copy. Incorrect changes to this file will make it
7+
impossible to load or build your projects from the command-line or the IDE.
8+
9+
Copyright (c) .NET Foundation. All rights reserved.
10+
***********************************************************************************************
11+
-->
12+
<Project>
13+
14+
<PropertyGroup>
15+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
16+
</PropertyGroup>
17+
18+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
19+
20+
<!-- The MicrosoftWindowsDesktopSdkPath is a hook so that you can redirect to a local version of the WPF SDK targets
21+
(ie in order to test changes locally) without modifying the .NET Core SDK itself. This should work
22+
as long as there are no changes to Sdk.props and Sdk.targets themselves. -->
23+
<PropertyGroup Condition="'$(MicrosoftWindowsDesktopSdkPath)' == ''">
24+
<MicrosoftWindowsDesktopSdkPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\targets))</MicrosoftWindowsDesktopSdkPath>
25+
</PropertyGroup>
26+
27+
<Import Project="$(MicrosoftWindowsDesktopSdkPath)\Microsoft.NET.Sdk.WindowsDesktop.props "/>
28+
29+
</Project>

‎packaging/Microsoft.NET.Sdk.WindowsDesktop/Sdk/Sdk.targets

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!--
2+
***********************************************************************************************
3+
Sdk.targets
4+
5+
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
6+
created a backup copy. Incorrect changes to this file will make it
7+
impossible to load or build your projects from the command-line or the IDE.
8+
9+
Copyright (c) .NET Foundation. All rights reserved.
10+
***********************************************************************************************
11+
-->
12+
<Project>
13+
14+
<PropertyGroup>
15+
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
16+
</PropertyGroup>
17+
18+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
19+
20+
<Import Project="$(MicrosoftWindowsDesktopSdkPath)\Microsoft.NET.Sdk.WindowsDesktop.targets "/>
21+
22+
</Project>

‎packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.props

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<Project>
2+
3+
<ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' And '$(UseWPF)' == 'true'">
4+
<ApplicationDefinition Include="App.xaml"
5+
Condition="'$(EnableDefaultApplicationDefinition)' != 'false' And Exists('$(MSBuildProjectDirectory)/App.xaml')">
6+
<Generator>MSBuild:Compile</Generator>
7+
</ApplicationDefinition>
8+
9+
<None Remove="@(ApplicationDefinition)"
10+
Condition="'$(EnableDefaultApplicationDefinition)' != 'false'" />
11+
12+
<Page Include="**/*.xaml"
13+
Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);@(ApplicationDefinition)"
14+
Condition="'$(EnableDefaultPageItems)' != 'false'" >
15+
<Generator>MSBuild:Compile</Generator>
16+
</Page>
17+
18+
<None Remove="@(Page)"
19+
Condition="'$(EnableDefaultPageItems)' != 'false'" />
20+
</ItemGroup>
21+
22+
<ItemGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
23+
<FrameworkReference Include="Microsoft.WindowsDesktop.App" IsImplicitlyDefined="true" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework' And '$(UseWPF)' == 'true' ">
27+
<_SDKImplicitReference Include="WindowsBase"/>
28+
<_SDKImplicitReference Include="PresentationCore"/>
29+
<_SDKImplicitReference Include="PresentationFramework"/>
30+
<_SDKImplicitReference Include="System.Windows.Controls.Ribbon"/>
31+
<_SDKImplicitReference Include="System.Xaml"/>
32+
<_SDKImplicitReference Include="UIAutomationClient"/>
33+
<_SDKImplicitReference Include="UIAutomationClientSideProviders"/>
34+
<_SDKImplicitReference Include="UIAutomationProvider"/>
35+
<_SDKImplicitReference Include="UIAutomationTypes"/>
36+
</ItemGroup>
37+
38+
<ItemGroup Condition=" '$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework' And '$(UseWindowsForms)' == 'true' ">
39+
<_SDKImplicitReference Include="System.Windows.Forms"/>
40+
</ItemGroup>
41+
42+
<ItemGroup Condition=" '$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETFramework' And '$(UseWindowsForms)' == 'true' And '$(UseWPF)' == 'true' ">
43+
<_SDKImplicitReference Include="WindowsFormsIntegration"/>
44+
</ItemGroup>
45+
</Project>

‎packaging/Microsoft.NET.Sdk.WindowsDesktop/targets/Microsoft.NET.Sdk.WindowsDesktop.targets

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<Project>
2+
3+
<!--
4+
For now, UseLegacyPresentationBuildTasks=true can be used to use the in-box framework
5+
PresentationBuildTasks and targets when running in full framework MSBuild. This is
6+
just an escape hatch while the new PresentationBuildTasks bake.
7+
8+
When we remove this,we can remove the correpsonding corresponding mscorlib swap targets in
9+
Microsoft.DesktopUI.App.targets, and the production of ref-mscorlib shims
10+
-->
11+
<Import Project="$(MSBuildToolsPath)\Microsoft.WinFX.targets"
12+
Condition ="'$(MSBuildRuntimeType)' != 'Core' and '$(UseLegacyPresentationBuildTasks)' == 'true'"/>
13+
14+
<Import Project="Microsoft.WinFX.targets"
15+
Condition="'$(MSBuildRuntimeType)' == 'Core' or '$(UseLegacyPresentationBuildTasks)' != 'true'" />
16+
17+
<ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' And '$(UseWPF)' == 'true'">
18+
19+
<!-- In the WindowsDesktop .props, we globbed all .xaml files as Page items. If any of those files are included
20+
as Resource, Content, or None items, then remove them from the Page items. -->
21+
<Page Remove="@(Resource);@(Content);@(None)"
22+
Condition="'$(EnableDefaultPageItems)' != 'false'" />
23+
</ItemGroup>
24+
25+
<!-- Generate error if there are duplicate page items. The task comes from the .NET SDK, and this target follows
26+
the pattern in the CheckForDuplicateItems task, where the .NET SDK checks for duplicate items for the item
27+
types it knows about. -->
28+
<Target Name="CheckForDuplicatePageItems" BeforeTargets="_CheckForInvalidConfigurationAndPlatform;CoreCompile"
29+
DependsOnTargets="CheckForDuplicateItems"
30+
Condition="'$(UseWPF)' == 'true'">
31+
32+
<CheckForDuplicateItems
33+
Items="@(Page)"
34+
ItemName="Page"
35+
DefaultItemsEnabled="$(EnableDefaultItems)"
36+
DefaultItemsOfThisTypeEnabled="$(EnableDefaultPageItems)"
37+
PropertyNameToDisableDefaultItems="EnableDefaultPageItems"
38+
MoreInformationLink="$(DefaultItemsMoreInformationLink)"
39+
ContinueOnError="$(CheckForDuplicateItemsContinueOnError)">
40+
<Output TaskParameter="DeduplicatedItems" ItemName="DeduplicatedPageItems" />
41+
</CheckForDuplicateItems>
42+
43+
<ItemGroup Condition="'$(DesignTimeBuild)' == 'true' And '@(DeduplicatedPageItems)' != ''">
44+
<Page Remove="@(Page)" />
45+
<Page Include="@(DeduplicatedPageItems)" />
46+
</ItemGroup>
47+
48+
</Target>
49+
50+
</Project>

‎packaging/Microsoft.NET.Sdk.WindowsDesktop/useSharedDesignerContext.txt

Whitespace-only changes.

‎src/Microsoft.DotNet.Wpf/src/Common/src/System/SR.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,20 @@ namespace MS.Internal.PresentationCore
1414
namespace MS.Utility
1515
#elif AUTOMATION
1616
namespace MS.Internal.Automation
17+
#elif REACHFRAMEWORK
18+
namespace System.Windows.Xps
19+
#elif PRESENTATIONFRAMEWORK
20+
namespace System.Windows
21+
#elif PRESENTATIONUI
22+
namespace System.Windows.TrustUI
23+
#elif WINDOWSFORMSINTEGRATION
24+
namespace System.Windows
25+
#elif RIBBON_IN_FRAMEWORK
26+
namespace Microsoft.Windows.Controls
1727
#else
1828
namespace System
1929
#endif
2030
{
21-
2231
internal partial class SR
2332
{
2433
private static ResourceManager ResourceManager => SRID.ResourceManager;
@@ -90,4 +99,4 @@ internal static string Format(string resourceFormat, object p1, object p2, objec
9099
return string.Format(resourceFormat, p1, p2, p3);
91100
}
92101
}
93-
}
102+
}

‎src/Microsoft.DotNet.Wpf/src/Directory.Build.Props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<PropertyGroup>
77
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
88
<GenerateResourcesCodeAsConstants>true</GenerateResourcesCodeAsConstants>
9-
<WpfSharedDir>$(MSBuildThisFileDirectory)Shared\</WpfSharedDir>
109
<WpfCommonDir>$(MSBuildThisFileDirectory)Common\</WpfCommonDir>
1110
<WpfGraphicsPath>$(MSBuildThisFileDirectory)WpfGfx\</WpfGraphicsPath>
1211
<WpfGraphicsDir>$(WpfGraphicsPath)</WpfGraphicsDir>

‎src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/MS/Internal/Localization/LocalizationDirectivesToLocFile.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System;
6+
7+
namespace MS.Internal
8+
{
9+
10+
internal enum LocalizationDirectivesToLocFile
11+
{
12+
None, // No Localization file generated.
13+
CommentsOnly, // Put the Localization comments to .loc file.
14+
All, // Put the localization comments and attributes to .loc file.
15+
Unknown
16+
}
17+
}
18+

0 commit comments

Comments
 (0)