Skip to content

Commit c3b1ece

Browse files
rladucarladuca
authored
Merge pull request #2553 from dotnet/experimental/oss-native
Open Sourcing WpfGfx and PenImc
2 parents 8e21142 + aac538b commit c3b1ece

File tree

1,460 files changed

+486849
-70
lines changed

Some content is hidden

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

1,460 files changed

+486849
-70
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ artifacts/
5959
StyleCopReport.xml
6060

6161
# Files built by Visual Studio
62-
*_i.c
6362
*_p.c
6463
*_i.h
6564
*.ilk

‎Microsoft.Dotnet.Wpf.sln‎

Lines changed: 670 additions & 0 deletions
Large diffs are not rendered by default.

‎NuGet.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
88
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
99
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
10+
<add key="dotnet-wd" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
1011
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1112
</packageSources>
1213
</configuration>

‎azure-pipelines.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ trigger:
3838
- release/3.0
3939
- release/3.0-preview9
4040
- release/3.1
41+
- experimental/*
4142
# - arcade
4243
paths:
4344
exclude:
@@ -53,6 +54,7 @@ pr:
5354
- internal/release/3.*
5455
- release/3.1
5556
- internal/release/*
57+
- experimental/*
5658
paths:
5759
exclude:
5860
- Documentation/*

‎eng/Version.Details.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,85 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.1.20111.1">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.0-preview.1.20110.4">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>0d9f2f88ddb3bccf9da205fba24c7bac8dfd42f9</Sha>
6+
<Sha>8818624e86a7aa64dbcd06fe78e406fa8caf008a</Sha>
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
10+
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
1111
<Uri>https://github.com/dotnet/corefx</Uri>
1212
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
1313
</Dependency>
14-
<Dependency Name="System.CodeDom" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
14+
<Dependency Name="System.CodeDom" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
1515
<Uri>https://github.com/dotnet/corefx</Uri>
1616
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
1717
</Dependency>
18-
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
18+
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
1919
<Uri>https://github.com/dotnet/corefx</Uri>
2020
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
2121
</Dependency>
22-
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
22+
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
2323
<Uri>https://github.com/dotnet/corefx</Uri>
2424
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
2525
</Dependency>
26-
<Dependency Name="System.DirectoryServices" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
26+
<Dependency Name="System.DirectoryServices" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
2727
<Uri>https://github.com/dotnet/corefx</Uri>
2828
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
2929
</Dependency>
30-
<Dependency Name="System.Drawing.Common" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
30+
<Dependency Name="System.Drawing.Common" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
3131
<Uri>https://github.com/dotnet/corefx</Uri>
3232
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
3333
</Dependency>
34-
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
34+
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
3535
<Uri>https://github.com/dotnet/corefx</Uri>
3636
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
3737
</Dependency>
38-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
3939
<Uri>https://github.com/dotnet/corefx</Uri>
4040
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
4141
</Dependency>
42-
<Dependency Name="System.Security.AccessControl" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
42+
<Dependency Name="System.Security.AccessControl" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
4343
<Uri>https://github.com/dotnet/corefx</Uri>
4444
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
4545
</Dependency>
46-
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
46+
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
4747
<Uri>https://github.com/dotnet/corefx</Uri>
4848
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
4949
</Dependency>
50-
<Dependency Name="System.Security.Permissions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
50+
<Dependency Name="System.Security.Permissions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
5151
<Uri>https://github.com/dotnet/corefx</Uri>
5252
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
5353
</Dependency>
54-
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
54+
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
5555
<Uri>https://github.com/dotnet/corefx</Uri>
5656
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
5757
</Dependency>
58-
<Dependency Name="System.Windows.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
58+
<Dependency Name="System.Windows.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
5959
<Uri>https://github.com/dotnet/corefx</Uri>
6060
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha1.19514.1" CoherentParentDependency="Microsoft.Private.Winforms">
63-
<Uri>https://github.com/dotnet/core-setup</Uri>
64-
<Sha>4ace84dbf94128b4825c76cdd09b46dba7473478</Sha>
65-
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20110.11">
62+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20110.5">
6763
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
64+
<Sha>8fed91a4435cae29ab0f0e4f18a291cd38b0f23e</Sha>
6965
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20110.11">
66+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20110.5">
7167
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
68+
<Sha>8fed91a4435cae29ab0f0e4f18a291cd38b0f23e</Sha>
7369
</Dependency>
74-
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
70+
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
7571
<Uri>https://github.com/dotnet/corefx</Uri>
7672
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
7773
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-preview.1.20111.2">
74+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="5.0.0-preview.1.20111.15">
7975
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
80-
<Sha>109547474d0f0044343f9bb392597013f61790cc</Sha>
76+
<Sha>938955fce440d685530393579f95ca8cefc24095</Sha>
8177
</Dependency>
82-
<Dependency Name="System.IO.Packaging" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
78+
<Dependency Name="System.IO.Packaging" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
8379
<Uri>https://github.com/dotnet/corefx</Uri>
8480
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
8581
</Dependency>
86-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19513.3" CoherentParentDependency="Microsoft.NETCore.App">
82+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="5.0.0-alpha1.19513.3" CoherentParentDependency="Microsoft.NETCore.App.Internal">
8783
<Uri>https://github.com/dotnet/coreclr</Uri>
8884
<Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
8985
</Dependency>
@@ -95,21 +91,25 @@
9591
<Uri>https://github.com/dotnet/coreclr</Uri>
9692
<Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
9793
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20110.11">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20110.5">
9995
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
96+
<Sha>8fed91a4435cae29ab0f0e4f18a291cd38b0f23e</Sha>
10197
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20110.11">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20110.5">
10399
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
100+
<Sha>8fed91a4435cae29ab0f0e4f18a291cd38b0f23e</Sha>
105101
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20110.11">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20110.5">
107103
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>56e162725058d80918f7aa7e0e689e1fde5c2106</Sha>
104+
<Sha>8fed91a4435cae29ab0f0e4f18a291cd38b0f23e</Sha>
109105
</Dependency>
110-
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App">
106+
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.NETCore.App.Internal">
111107
<Uri>https://github.com/dotnet/corefx</Uri>
112108
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
113109
</Dependency>
110+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-alpha1.19514.1" CoherentParentDependency="Microsoft.Private.Winforms">
111+
<Uri>https://github.com/dotnet/core-setup</Uri>
112+
<Sha>4ace84dbf94128b4825c76cdd09b46dba7473478</Sha>
113+
</Dependency>
114114
</ToolsetDependencies>
115115
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2121
<PropertyGroup>
22-
<MicrosoftNETCoreAppVersion>5.0.0-alpha1.19514.1</MicrosoftNETCoreAppVersion>
22+
<MicrosoftNETCoreAppInternalVersion>5.0.0-alpha1.19514.1</MicrosoftNETCoreAppInternalVersion>
2323
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha1.19512.1</MicrosoftNETCorePlatformsVersion>
2424
<SystemDrawingCommonVersion>5.0.0-alpha1.19512.1</SystemDrawingCommonVersion>
2525
<SystemDirectoryServicesVersion>5.0.0-alpha1.19512.1</SystemDirectoryServicesVersion>
@@ -41,9 +41,9 @@
4141
</PropertyGroup>
4242
<!-- Packages that come from https://github.com/dotnet/arcade -->
4343
<PropertyGroup>
44-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20110.11</MicrosoftDotNetApiCompatVersion>
45-
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20110.11</MicrosoftDotNetCodeAnalysisPackageVersion>
46-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20110.11</MicrosoftDotNetGenAPIVersion>
44+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20110.5</MicrosoftDotNetApiCompatVersion>
45+
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20110.5</MicrosoftDotNetCodeAnalysisPackageVersion>
46+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20110.5</MicrosoftDotNetGenAPIVersion>
4747
</PropertyGroup>
4848
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
4949
<PropertyGroup>
@@ -96,26 +96,7 @@
9696
<SystemIOPackagingPackage>System.IO.Packaging</SystemIOPackagingPackage>
9797
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
9898
</PropertyGroup>
99-
<!--
100-
This is a toolset dependency added for use *only* by tests
101-
102-
!!!This dependency creates a cycle in the dependency-graph, but only in the 'toolset' portion of the graph. !!!
103-
104-
Note: Also see [Dependency graph](https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#viewing-the-dependency-graph)
105-
106-
- https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int consumes Microsoft.DotNet.Wpf.GitHub published by dotnet/wpf (this repo)
107-
- https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int produces Microsoft.DotNet.Wpf.DncEng
108-
- Microsoft.DotNet.Wpf.DncEng should, normally, be passed further along (and be consumed back by dotnet/wpf)
109-
- Many WPF tests are non-trivial integration tests which require references to the whole WPF stack.
110-
- In order to satisfy these references, we consume Microsoft.DotNet.Wpf.DncEng for tests-only.
111-
- This is added as a DARC subscription that
112-
- (a) Updates EveryDay
113-
- (b) Updates *only* in ".NET Core 3 Dev" channel
114-
- (c) Does not update in ".NET Core 3 Release" channel
115-
116-
It is worth reiterating that this package *should not* be consumed to build the product.
117-
-->
11899
<PropertyGroup>
119-
<MicrosoftDotNetWpfDncEngVersion>5.0.0-preview.1.20111.2</MicrosoftDotNetWpfDncEngVersion>
100+
<MicrosoftDotNetWpfDncEngVersion>5.0.0-preview.1.20111.15</MicrosoftDotNetWpfDncEngVersion>
120101
</PropertyGroup>
121102
</Project>

‎eng/WpfArcadeSdk/tools/ShippingProjects.props‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,22 @@
2929
PresentationFramework.Luna;
3030
PresentationFramework.Royale;
3131
WindowsFormsIntegration;
32+
PenImc;
33+
wpfgfx;
34+
D3DCompiler;
35+
VCRuntime
3236
</ExternalShippingProjects>
3337

3438
<InternalShippingLibProjects>
3539
$(InternalShippingLibProjects);
40+
bilinearspan
3641
</InternalShippingLibProjects>
37-
42+
3843
<InternalShippingProjects>
3944
$(InternalShippingLibProjects);
40-
PenImc;
4145
PresentationNative;
42-
WpfGfx;
43-
D3DCompiler;
44-
VCRuntime
4546
</InternalShippingProjects>
46-
47+
4748
<ShippingProjects>
4849
$(ExternalShippingProjects);
4950
$(InternalShippingProjects)

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
"runtimes": {
55
"dotnet": [
66
"2.1.7",
7-
"$(MicrosoftNETCoreAppVersion)"
7+
"$(MicrosoftNetCoreAppInternalVersion)"
88
]
99
},
1010
"vs": {
1111
"version": "16.1"
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.11",
16-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20110.11"
15+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.5",
16+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20110.5"
1717
},
1818
"native-tools": {
1919
"strawberry-perl": "5.28.1.1-1",

‎src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup>
22+
<ConfigurationType>DynamicLibrary</ConfigurationType>
23+
<CLRSupport>false</CLRSupport>
24+
</PropertyGroup>
25+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
26+
<Import Project="$(WpfCppProps)" />
27+
<PropertyGroup>
28+
<!--
29+
Target assembly will be a privatized copy of D3DCompiler, like
30+
d3dcompiler_47_cor3.dll
31+
-->
32+
<TargetName>$(D3DCompilerDllBaseName)$(D3DCompilerVersion)$(WpfVersionSuffix)</TargetName>
33+
</PropertyGroup>
34+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
35+
<PropertyGroup>
36+
<RedistSourcePath>$(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll</RedistSourcePath>
37+
</PropertyGroup>
38+
<PropertyGroup Label="Globals">
39+
<VCProjectVersion>16.0</VCProjectVersion>
40+
<ProjectGuid>{60E8E057-79E1-4860-A015-23C9587434F7}</ProjectGuid>
41+
<Keyword>Win32Proj</Keyword>
42+
</PropertyGroup>
43+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
44+
</Project>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
<!--
3+
IsRedistProject=true should be set prior to importing Directory.Build.props from ancestor folders
4+
-->
5+
<PropertyGroup>
6+
<IsRedistProject>true</IsRedistProject>
7+
</PropertyGroup>
8+
9+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
10+
</Project>

0 commit comments

Comments
 (0)