-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add WindowsBase, PresentationCore, PresentationFramework (+more) sour…
…ces (#720) Add PresentationFramework, PresentationCore, WindowsBase, DirectWriteForwarder sources, along with sources for allied assemblies
- Loading branch information
1 parent
15b0559
commit ae17905
Showing
3,987 changed files
with
1,776,155 additions
and
2,365 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <!-- $(WpfSharedDir) is present in the current repository --> | ||
| <WpfSharedDir Condition="Exists('$(WpfSourceDir)shared\') And '$(RepositoryName)'!='dotnet-wpf-int'">$(WpfSourceDir)shared\</WpfSharedDir> | ||
| <!-- Consume from NuGet cache --> | ||
| <WpfSharedDir Condition="'$(WpfSharedDir)'=='' And Exists('$(WpfArcadeSdkRoot)src\shared\')">$(WpfArcadeSdkRoot)src\shared\</WpfSharedDir> | ||
| <!-- Consume from $(WpfTestArcadeWpfSdkPath) --> | ||
| <WpfSharedDir Condition="'$(WpfSharedDir)'=='' And Exists('$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Shared\')">$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Shared\</WpfSharedDir> | ||
|
|
||
| <!-- $(WpfCommonDir) is present in the current repository --> | ||
| <WpfCommonDir Condition="Exists('$(WpfSourceDir)Common\') And '$(RepositoryName)'!='dotnet-wpf-int'">$(WpfSourceDir)Common\</WpfCommonDir> | ||
| <!-- Consume from NuGet cache --> | ||
| <WpfCommonDir Condition="'$(WpfCommonDir)'=='' And Exists('$(WpfArcadeSdkRoot)src\Common\')">$(WpfArcadeSdkRoot)src\Common\</WpfCommonDir> | ||
| <!-- Consume from $(WpfTestArcadeWpfSdkPath) --> | ||
| <WpfCommonDir Condition="'$(WpfCommonDir)'=='' And Exists('$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Common\')">$(WpfArcadeSdkRoot)..\..\src\Microsoft.DotNet.Wpf\src\Common\</WpfCommonDir> | ||
|
|
||
|
|
||
| <WpfTracingDir>$(WpfSharedDir)Tracing\</WpfTracingDir> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,131 @@ | ||
| <Project> | ||
| <PropertyGroup Condition="'$(WpfTest)'=='true'"> | ||
| <PropertyGroup Condition="'$(WpfTest)'=='true' Or '$(IsTestProject)'=='true'"> | ||
| <RuntimeIdentifier Condition="('$(Platform)'!='AnyCPU' and '$(Platform)'!='Win32') Or $(Platform.EndsWith('64'))">win-$(Platform)</RuntimeIdentifier> | ||
| <RuntimeIdentifier Condition="'$(Platform)'=='AnyCPU' or '$(Platform)'=='Win32' or '$(Platform)'=='x86'">win-x86</RuntimeIdentifier> | ||
| </PropertyGroup> | ||
| <!-- Arcade SDK defaults to AnyCpu ~= x64. In WPF, we will map AnyCpu => x86 instead --> | ||
| <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'"> | ||
| <TestArchitectures Condition="'$(PlatformTarget)' == '' or '$(PlatformTarget)' == 'AnyCpu'">x86</TestArchitectures> | ||
| <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch> | ||
| <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> | ||
| <IsSelfContained>true</IsSelfContained> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition="'$(WpfTest)'=='true'"> | ||
| <PackageReference Include="runtime.$(RuntimeIdentifier).$(MicrosoftDotNetWpfDncEngPackage)" | ||
|
|
||
| <ItemGroup Condition="'$(IsTestProject)' == 'true' or '$(WpfTest)'=='true'"> | ||
| <!-- | ||
| Only reference Microsoft.DotNet.Wpf.DncEng when building tests in dotnet/wpf | ||
| This references is not needed when building tests in dotnet-wpf-int | ||
| --> | ||
| <PackageReference Include="runtime.$(RuntimeIdentifier).$(MicrosoftDotNetWpfDncEngPackage)" | ||
| Condition="'$(RepositoryName)'=='wpf'" | ||
| Version="$(MicrosoftDotNetWpfDncEngVersion)"> | ||
| <CopyLocal>true</CopyLocal> | ||
| <GeneratePathProperty>true</GeneratePathProperty> | ||
| </PackageReference> | ||
|
|
||
| <!-- | ||
| PackageReference from individual WPF projects here | ||
| --> | ||
| <PackageReference Include="$(SystemIOPackagingPackage)" Version="$(SystemIOPackagingVersion)" CopyLocal="true" /> | ||
| <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" /> | ||
| <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" CopyLocal="true" /> | ||
| <PackageReference Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogPackageVersion)" CopyLocal="true" /> | ||
| <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" CopyLocal="true" /> | ||
| <PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" CopyLocal="true" /> | ||
| <PackageReference Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsPackageVersion)" CopyLocal="true" /> | ||
|
|
||
| <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlPackageVersion)" CopyLocal="true" /> | ||
| <PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsPackageVersion)" CopyLocal="true" /> | ||
|
|
||
|
|
||
|
|
||
| <!-- These exist to ensure that dependencies (esp. native ones) are binplaced with tests correctly --> | ||
| <None Condition="'$(RuntimeIdentifier)'=='win-x64'" | ||
| Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll" | ||
| <None Condition="'$(RuntimeIdentifier)'=='win-x64'" | ||
| Include="$(Pkgruntime_win-x64_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll" | ||
| CopyToOutputDirectory="PreserveNewest"/> | ||
| <None Condition="'$(RuntimeIdentifier)'=='win-x86'" | ||
| Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll" | ||
| Include="$(Pkgruntime_win-x86_Microsoft_DotNet_Wpf_DncEng)\runtimes\$(RuntimeIdentifier)\native\*.dll" | ||
| CopyToOutputDirectory="PreserveNewest"/> | ||
|
|
||
| <_wpfProjectsNotWindowsBase Include="@(WpfProjectPath)" Exclude="WindowsBase" /> | ||
| <_wpfProjectsWindowsBase Include="@(WpfProjectPath)" Exclude="@(_wpfProjectsWindowsBase)" /> | ||
|
|
||
| <!-- | ||
| Do not include WindowsBase. There is a bug in the SDK that will prevent proper deps.json generation when WindowsBase.csproj | ||
| and Microsoft.NetCore.App/WindowsBase.dll clash. Part of the problem is due to https://github.com/dotnet/sdk/issues/2674. | ||
| Directly referencing DLL's works correctly and generates good deps.json. So instead of reference WindowsBase.csproj, just | ||
| obtain the raw path to WindowsBase.dll and add it to @(Reference). This is safe to do since | ||
| WindowsBase will be built as a transitive reference via PresentationCore, PresentationFramework etc. | ||
| Also make sure that Microsoft.NetCore.App/WindowsBase.dll is removed from @(Reference). | ||
| --> | ||
| <ProjectReference Include="@(_wpfProjectsNotWindowsBase->'%(ProjectPath)')" > | ||
| <Private>True</Private> | ||
| <OutputItemType>_wpfProjectReferenceLocallyBuildAssemblies</OutputItemType> | ||
| </ProjectReference> | ||
|
|
||
| <ProjectReference Include="@(_wpfProjectsWindowsBase->'%(ProjectPath)')" > | ||
| <Private>True</Private> | ||
| <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| <OutputItemType>_windowsBaseAssemblyLocallyBuiltPath</OutputItemType> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(WpfTest)'=='true' or '$(IsTestProject)'=='true'"> | ||
| <ResolveAssemblyReferencesDependsOn> | ||
| AddWindowsBaseToReferences; | ||
| $(ResolveAssemblyReferencesDependsOn) | ||
| </ResolveAssemblyReferencesDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="AddWindowsBaseToReferences"> | ||
| <ItemGroup> | ||
| <Reference Include="%(_windowsBaseAssemblyLocallyBuiltPath.FullPath)" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <Target Name="RemoveWindowsBaseNetCoreAppReference" | ||
| AfterTargets="ResolveTargetingPacks" | ||
| Returns="@(Reference)" | ||
| Condition="'$(WpfTest)'=='true' or '$(IsTestProject)'=='true'"> | ||
| <ItemGroup> | ||
| <Reference Remove="@(Reference)" Condition="'%(FileName)'=='WindowsBase' and '%(Reference.ResolvedFrom)'=='TargetingPack'" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <!-- | ||
| This target ensures that Microsoft.DotNet.Wpf.DncEng would not inadvertently over-supply references that | ||
| are already satisfied by ProjectReference's from within this repo. This should almost never happen, except | ||
| when $(MicrosoftDotNetWpfDncEngVersion) is set to something really old (something that was built <= 05/22/2019) | ||
| --> | ||
| <Target | ||
| Name="LimitMicrosoftDotNetDncEngReferences" | ||
| AfterTargets="ResolveTargetingPacks" | ||
| Returns="@(Reference)" | ||
| Condition="'$(WpfTest)'=='true' or '$(IsTestProject)'=='true'"> | ||
|
|
||
| <ItemGroup> | ||
| <_microsoftDotNetDncEngRefs Remove="@(_microsoftDotNetDncEngRefs)" /> | ||
| <_microsoftDotNetDncEngRefs Include="@(Reference)" | ||
| Condition="'%(Reference.NuGetPackageId)'=='runtime.$(RuntimeIdentifier).Microsoft.DotNet.Wpf.DncEng'"> | ||
| <OriginalPath>%(Reference.Identity)</OriginalPath> | ||
| </_microsoftDotNetDncEngRefs> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <_microsoftDotNetDncEngReferences Remove="@(_microsoftDotNetDncEngReferences)" /> | ||
| </ItemGroup> | ||
| <FilterItem1ByItem2 Item1="@(_microsoftDotNetDncEngRefs->'%(FileName)')" | ||
| Item2="@(_wpfProjectReferenceLocallyBuildAssemblies->'%(FileName)')" | ||
| Metadata2="Identity" | ||
| PreserveItem1Metadata="true"> | ||
| <Output ItemName="_microsoftDotNetDncEngReferencesToAvoid" TaskParameter="Result" /> | ||
| </FilterItem1ByItem2> | ||
|
|
||
| <ItemGroup> | ||
| <Reference Remove="@(_microsoftDotNetDncEngReferencesToAvoid->'%(OriginalPath)')"/> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| </Project> |
Oops, something went wrong.