Skip to content

Commit 422c8df

Browse files
authored
Convert C# Reference Assembly Generation to Use GenAPI (dotnet#1057)
* Adding DARC dependency for Microsoft.DotNet.GenAPI and updating * Version updates, adding basic target * Enabling GenAPI to generate sources for all applicable assemblies. Disabling use of ProduceReferenceAssembly across the codebase. * Adding PBT to GenAPI project list. * Initial build targets for GenAPI and generated reference assembly projects. * Reverting to projects explicitly declaring their needed PackageReferences. Otherwise we can potentially import at incorrect times, overriding various values from the WpfArcadeSdk. * Adding additional GenAPI params. * Switching to generate the reference assembly project via a task using the runtime assembly's project as a template. Based on PBT's GenerateTemporaryTargetAssembly. * Adding project exclusions for WIndowsBase * Turning off XLIFF generation for reference assemblies. Removing EmbeddedResources from reference assemblies. * Removing module initializer injection from PCore-ref * Removing CompileDependsOn from PFramework-ref * Removing disabling of default compile items to pickup the generated reference sources. * Adding global API exclusions file. * Removing further default excludes. * Adding initial exclusions and NoWarns based on building. * Initial change to manual reference assembly projects. File dumping the initial generated code and projects. * Modifications to build System.Xaml-ref. Changes to ensure that reference assembly projects are properly bin placed into the ref pack. * Fixing issues with checks against hand ref assembly property. Adding WindowsBase reference assembly. * Adding UIAutomationTypes reference assembly * Adding reference project for UIAutomationProvider * Adding UIAutomationClient ref project * Removing workaround for WindowsBase GenAPI issue and adding back manually fixed output for WindowsBase reference assembly. * Adding UIAutomationClientSideProviders reference project. * Adding System.Windows.Input.Manipulations reference project * Adding PresentationBuildTasks reference project * Adding PresentationCore ref project. * Cleaning up PresentationCore ref assembly and adding exclusion notes. * Adding security attributes to exclusions * Fixing exclusion list * Fixing exclude param * Fixing attribute exclusions to match CoreFX. Fixing cmd line params to GenAPI. * Applying new exclusions to ref assembly code and fixups * Cleaning UIA assemblies and updating code with latest exclusions. * New exclusions and cleanup * PBT cleanup and new exclusions * New exclusions and fixups for PCore ref assembly * Adding ReachFramework ref project and cleaning. * Adding PresentationFramework reference assembly and fixups. * Removing any extraneous ProjectReferences from reference assembly projects. Anything that is not itself a reference assembly was removed. * Adding back assembly attributes to ref assemblies where applicable. Fixing PresentationFramework-ref to use private copy of asm attributes due to internals dependency. * Removing PBT reference assembly as we're not shipping one anymore. * Further removing PBT-ref * Adding the ReferenceAssemblyAttribute to all hand-crafted ref assemblies. * Removing no longer applicable tasks * Fixing an issue with incorrect signing of System.Xaml. * Enable ApiCompat against new ref assemblies. Fixing ApiCompat issues with PCore and re-baselining. * PresentationFramework ApiCompat baseline * ReachFramework ApiCompat baseline * System.Windows.Input.Manipulations ApiCompat baseline * UIA ApiCompat baselines * Fixing removal of ObsoleteAttribute and ApiCompat baseline for System.Xaml * ApiCompat baselines for WindowsBase * Updating WindowsBase ApiCompat baseline. * Adding back attributes that were removed incorrectly. * Fixing missing attributes * Fixing missing attributes on reachframework * Updating PCore baselines and adding back missing attrs * PresentationFramework fixup + baselines * Fixing ApiCompat bugs * Re-baselining with ApiCompat fixes and removing old, no longer applicable baseline files. * Updating reference assemblies due to System.Security.Permissions changes. * Fixing up ResolveMicrosoftDotNetWpfGitHubReferences so that dotnet_wpf_int references lib assemblies instead of ref assemblies from the GitHub package. * Fixing up ApiCompat for C++\CLI vs C# runtime projects. * Fixing PackageRefernece for RID specific MicrosoftDotNetWpfGitHubPackageso that it doesn't get added when the package isn't defined (building in the open). * Adding dotnet-wpf-int ref assemblies to signing and apicompat. * Cleaning up reference assembly generation. Fixing Intellisense XML placement. * Add back internals to support XAML compilation.
1 parent 896631c commit 422c8df

File tree

77 files changed

+33163
-198
lines changed

Some content is hidden

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

77 files changed

+33163
-198
lines changed

Documentation/gen-api.md

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# GenApi Usage in WPF on .NET Core
2+
In WPF on .NET Core, C# reference assemblies are created via the use of [GenAPI](https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.GenAPI) and a separate reference assembly project located in the `ref` directory under a particular assemblies source directory.
3+
4+
WPF assemblies make extensive use of the [InternalsVisibleToAttribute](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.compilerservices.internalsvisibletoattribute?view=netcore-3.0) which precludes the use of [ProduceReferenceAssembly](https://docs.microsoft.com/en-us/visualstudio/msbuild/common-msbuild-project-properties?view=vs-2019) or [ProduceOnlyReferenceAssembly](https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-options/refonly-compiler-option). This is because these compiler options will include internal types and members in the reference assembly. In WPF, this creates dangling references to assemblies that do not exist in the `WindowsDesktop` reference pack.
5+
6+
Using GenAPI allows us to strip out internals, removing the dangling references from our reference assemblies.
7+
8+
## [GenApi.props](/eng/WpfArcadeSdk/tools/GenApi.props)
9+
Contains various properties related to GenAPI runs and configurations.
10+
* `GenAPIEnabledProjects`
11+
* The set of projects to run GenAPI on
12+
* `GlobalApiExclusionsFile`
13+
* A file that specifies API surface area to exclude from code generation (see [GlobalApiExclusions.txt](/eng/WpfArcadeSdk/tools/GenApi/GlobalApiExclusions.txt))
14+
* `GlobalAttrExclusionsFile`
15+
* A file that specifies Attributes to exclude from code generation (see [GlobalAttrExclusions.txt](/eng/WpfArcadeSdk/tools/GenApi/GlobalAttrExclusions.txt))
16+
* `GenAPIAdditionalParameters`
17+
* Parameters to GenAPI built up from local configuration
18+
* _GenerateReferenceAssemblySource
19+
* A private parameter used to enable GenAPI targets
20+
## [GenApi.targets](/eng/WpfArcadeSdk/tools/GenApi.targets)
21+
Contains targets and properties related to GenAPI runs
22+
* `GenAPITargetDir`
23+
* The directory where GenAPI will generate code
24+
* `GenAPITargetPath`
25+
* The full path to the file GenAPI will generate
26+
* `EnsureGenAPITargetDirectory`
27+
* Creates the directory specified by `GenAPITargetDir` if it does not exist
28+
## Using GenAPI in WPF
29+
GenAPI is run only on-demand. In the event that a change to a runtime assembly creates new public surface area, a developer will see an [ApiCompat](api-compat.md) error between the reference assembly and the runtime assembly. In order to address this, the developer must run GenAPI to generate new reference assembly code.
30+
### Running GenAPI
31+
GenAPI can be run by setting the following MSBuild property while building.
32+
```
33+
/p:GenerateReferenceAssemblySource=true
34+
```
35+
When a build is run with that property enabled, GenAPI will read the runtime assembly and generate a new `{AssemblyName}.cs` file under the ref directory in the assembly's source tree.
36+
37+
This new file will contain the newly created surface area and will need to be checked in along with the runtime assembly change. The next build without `GenerateReferenceAssemblySource` enabled will no longer display an ApiCompat error as the surface area will now match the baseline.
38+
### Issues with GenAPI
39+
Often, GenAPI will generate code output that will contain code that is either private, internal, or creates build errors. For this reason a developer usually cannot just use the output of GenAPI directly. Instead, the developer should do the following:
40+
* Build with GenAPI enabled
41+
* Diff the output file against the previous version
42+
* Extract just the new surface area (and related code) from the generated code
43+
* Revert the generated file
44+
* Add back the new surface area to the reference assembly code
45+
* Ensure that nothing in the new surface area is private or internal unless requried by XAML compilation or other reference assemblies
46+
* Rebuild without GenAPI enabled and verify there are no ApiCompat errors

Microsoft.Dotnet.Wpf.sln

+140
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,28 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Printing-Presentatio
7777
EndProject
7878
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D0AED517-9972-41CB-8751-983E4EB8F511}"
7979
EndProject
80+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCore-ref", "src\Microsoft.DotNet.Wpf\src\PresentationCore\ref\PresentationCore-ref.csproj", "{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}"
81+
EndProject
82+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework-ref", "src\Microsoft.DotNet.Wpf\src\PresentationFramework\ref\PresentationFramework-ref.csproj", "{4B948597-3625-4B63-A272-2A9D8B37DC6D}"
83+
EndProject
84+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReachFramework-ref", "src\Microsoft.DotNet.Wpf\src\ReachFramework\ref\ReachFramework-ref.csproj", "{B824914F-06A9-4FA4-8584-1B4F3E041973}"
85+
EndProject
8086
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Printing-ref", "src\Microsoft.DotNet.Wpf\src\System.Printing\ref\System.Printing-ref.csproj", "{0D7A2936-51DB-4B6F-906B-301E20141064}"
8187
EndProject
88+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Input.Manipulations-ref", "src\Microsoft.DotNet.Wpf\src\System.Windows.Input.Manipulations\ref\System.Windows.Input.Manipulations-ref.csproj", "{89FF315B-1200-472B-9CCA-93D51512604B}"
89+
EndProject
90+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml-ref", "src\Microsoft.DotNet.Wpf\src\System.Xaml\ref\System.Xaml-ref.csproj", "{65C38C26-CC7A-4389-A5FF-46E55A214492}"
91+
EndProject
92+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAutomationClient-ref", "src\Microsoft.DotNet.Wpf\src\UIAutomation\UIAutomationClient\ref\UIAutomationClient-ref.csproj", "{702AF75A-9BF3-494C-8265-4E3D1B2937F5}"
93+
EndProject
94+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAutomationClientSideProviders-ref", "src\Microsoft.DotNet.Wpf\src\UIAutomation\UIAutomationClientSideProviders\ref\UIAutomationClientSideProviders-ref.csproj", "{38702943-E4E0-4DD8-9301-6BCCB49A759E}"
95+
EndProject
96+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAutomationProvider-ref", "src\Microsoft.DotNet.Wpf\src\UIAutomation\UIAutomationProvider\ref\UIAutomationProvider-ref.csproj", "{5F2BDB27-183B-49A7-89E5-E5CA039D5001}"
97+
EndProject
98+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UIAutomationTypes-ref", "src\Microsoft.DotNet.Wpf\src\UIAutomation\UIAutomationTypes\ref\UIAutomationTypes-ref.csproj", "{29C13CF5-AFE9-4D43-8CF0-46361096117F}"
99+
EndProject
100+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsBase-ref", "src\Microsoft.DotNet.Wpf\src\WindowsBase\ref\WindowsBase-ref.csproj", "{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}"
101+
EndProject
82102
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B0EFDB12-C931-4E7F-A6C2-D4AC111D7EDF}"
83103
EndProject
84104
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DrtXaml", "src\Microsoft.DotNet.Wpf\test\DRT\DrtXaml\DrtXaml\DrtXaml.csproj", "{FAB114A2-2C6C-4372-A6BB-BC087B646E3A}"
@@ -575,6 +595,126 @@ Global
575595
{A78C427C-F7FE-486A-8777-1701E6E81BE0}.Release|x64.Build.0 = Release|x64
576596
{A78C427C-F7FE-486A-8777-1701E6E81BE0}.Release|x86.ActiveCfg = Release|Any CPU
577597
{A78C427C-F7FE-486A-8777-1701E6E81BE0}.Release|x86.Build.0 = Release|Any CPU
598+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
599+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Debug|Any CPU.Build.0 = Debug|Any CPU
600+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Debug|x64.ActiveCfg = Debug|x64
601+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Debug|x64.Build.0 = Debug|x64
602+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Debug|x86.ActiveCfg = Debug|Any CPU
603+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Debug|x86.Build.0 = Debug|Any CPU
604+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Release|Any CPU.ActiveCfg = Release|Any CPU
605+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Release|Any CPU.Build.0 = Release|Any CPU
606+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Release|x64.ActiveCfg = Release|x64
607+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Release|x64.Build.0 = Release|x64
608+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Release|x86.ActiveCfg = Release|Any CPU
609+
{65C38C26-CC7A-4389-A5FF-46E55A214492}.Release|x86.Build.0 = Release|Any CPU
610+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
611+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Debug|Any CPU.Build.0 = Debug|Any CPU
612+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Debug|x64.ActiveCfg = Debug|x64
613+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Debug|x64.Build.0 = Debug|x64
614+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Debug|x86.ActiveCfg = Debug|Any CPU
615+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Debug|x86.Build.0 = Debug|Any CPU
616+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Release|Any CPU.ActiveCfg = Release|Any CPU
617+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Release|Any CPU.Build.0 = Release|Any CPU
618+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Release|x64.ActiveCfg = Release|x64
619+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Release|x64.Build.0 = Release|x64
620+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Release|x86.ActiveCfg = Release|Any CPU
621+
{8D2B8BD2-25A5-47FD-B1E8-87E800CA2184}.Release|x86.Build.0 = Release|Any CPU
622+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
623+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Debug|Any CPU.Build.0 = Debug|Any CPU
624+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Debug|x64.ActiveCfg = Debug|x64
625+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Debug|x64.Build.0 = Debug|x64
626+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Debug|x86.ActiveCfg = Debug|Any CPU
627+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Debug|x86.Build.0 = Debug|Any CPU
628+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Release|Any CPU.ActiveCfg = Release|Any CPU
629+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Release|Any CPU.Build.0 = Release|Any CPU
630+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Release|x64.ActiveCfg = Release|x64
631+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Release|x64.Build.0 = Release|x64
632+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Release|x86.ActiveCfg = Release|Any CPU
633+
{29C13CF5-AFE9-4D43-8CF0-46361096117F}.Release|x86.Build.0 = Release|Any CPU
634+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
635+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Debug|Any CPU.Build.0 = Debug|Any CPU
636+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Debug|x64.ActiveCfg = Debug|x64
637+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Debug|x64.Build.0 = Debug|x64
638+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Debug|x86.ActiveCfg = Debug|Any CPU
639+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Debug|x86.Build.0 = Debug|Any CPU
640+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Release|Any CPU.ActiveCfg = Release|Any CPU
641+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Release|Any CPU.Build.0 = Release|Any CPU
642+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Release|x64.ActiveCfg = Release|x64
643+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Release|x64.Build.0 = Release|x64
644+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Release|x86.ActiveCfg = Release|Any CPU
645+
{5F2BDB27-183B-49A7-89E5-E5CA039D5001}.Release|x86.Build.0 = Release|Any CPU
646+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
647+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
648+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Debug|x64.ActiveCfg = Debug|x64
649+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Debug|x64.Build.0 = Debug|x64
650+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Debug|x86.ActiveCfg = Debug|Any CPU
651+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Debug|x86.Build.0 = Debug|Any CPU
652+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
653+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Release|Any CPU.Build.0 = Release|Any CPU
654+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Release|x64.ActiveCfg = Release|x64
655+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Release|x64.Build.0 = Release|x64
656+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Release|x86.ActiveCfg = Release|Any CPU
657+
{702AF75A-9BF3-494C-8265-4E3D1B2937F5}.Release|x86.Build.0 = Release|Any CPU
658+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
659+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Debug|Any CPU.Build.0 = Debug|Any CPU
660+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Debug|x64.ActiveCfg = Debug|x64
661+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Debug|x64.Build.0 = Debug|x64
662+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Debug|x86.ActiveCfg = Debug|Any CPU
663+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Debug|x86.Build.0 = Debug|Any CPU
664+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Release|Any CPU.ActiveCfg = Release|Any CPU
665+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Release|Any CPU.Build.0 = Release|Any CPU
666+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Release|x64.ActiveCfg = Release|x64
667+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Release|x64.Build.0 = Release|x64
668+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Release|x86.ActiveCfg = Release|Any CPU
669+
{38702943-E4E0-4DD8-9301-6BCCB49A759E}.Release|x86.Build.0 = Release|Any CPU
670+
{89FF315B-1200-472B-9CCA-93D51512604B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
671+
{89FF315B-1200-472B-9CCA-93D51512604B}.Debug|Any CPU.Build.0 = Debug|Any CPU
672+
{89FF315B-1200-472B-9CCA-93D51512604B}.Debug|x64.ActiveCfg = Debug|x64
673+
{89FF315B-1200-472B-9CCA-93D51512604B}.Debug|x64.Build.0 = Debug|x64
674+
{89FF315B-1200-472B-9CCA-93D51512604B}.Debug|x86.ActiveCfg = Debug|Any CPU
675+
{89FF315B-1200-472B-9CCA-93D51512604B}.Debug|x86.Build.0 = Debug|Any CPU
676+
{89FF315B-1200-472B-9CCA-93D51512604B}.Release|Any CPU.ActiveCfg = Release|Any CPU
677+
{89FF315B-1200-472B-9CCA-93D51512604B}.Release|Any CPU.Build.0 = Release|Any CPU
678+
{89FF315B-1200-472B-9CCA-93D51512604B}.Release|x64.ActiveCfg = Release|x64
679+
{89FF315B-1200-472B-9CCA-93D51512604B}.Release|x64.Build.0 = Release|x64
680+
{89FF315B-1200-472B-9CCA-93D51512604B}.Release|x86.ActiveCfg = Release|Any CPU
681+
{89FF315B-1200-472B-9CCA-93D51512604B}.Release|x86.Build.0 = Release|Any CPU
682+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
683+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Debug|Any CPU.Build.0 = Debug|Any CPU
684+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Debug|x64.ActiveCfg = Debug|x64
685+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Debug|x64.Build.0 = Debug|x64
686+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Debug|x86.ActiveCfg = Debug|Any CPU
687+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Debug|x86.Build.0 = Debug|Any CPU
688+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Release|Any CPU.ActiveCfg = Release|Any CPU
689+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Release|Any CPU.Build.0 = Release|Any CPU
690+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Release|x64.ActiveCfg = Release|x64
691+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Release|x64.Build.0 = Release|x64
692+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Release|x86.ActiveCfg = Release|Any CPU
693+
{9F39CC8E-7EDE-4F93-B8D8-0320533DF420}.Release|x86.Build.0 = Release|Any CPU
694+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
695+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Debug|Any CPU.Build.0 = Debug|Any CPU
696+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Debug|x64.ActiveCfg = Debug|x64
697+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Debug|x64.Build.0 = Debug|x64
698+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Debug|x86.ActiveCfg = Debug|Any CPU
699+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Debug|x86.Build.0 = Debug|Any CPU
700+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Release|Any CPU.ActiveCfg = Release|Any CPU
701+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Release|Any CPU.Build.0 = Release|Any CPU
702+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Release|x64.ActiveCfg = Release|x64
703+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Release|x64.Build.0 = Release|x64
704+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Release|x86.ActiveCfg = Release|Any CPU
705+
{B824914F-06A9-4FA4-8584-1B4F3E041973}.Release|x86.Build.0 = Release|Any CPU
706+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
707+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
708+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Debug|x64.ActiveCfg = Debug|x64
709+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Debug|x64.Build.0 = Debug|x64
710+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Debug|x86.ActiveCfg = Debug|Any CPU
711+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Debug|x86.Build.0 = Debug|Any CPU
712+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
713+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Release|Any CPU.Build.0 = Release|Any CPU
714+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Release|x64.ActiveCfg = Release|x64
715+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Release|x64.Build.0 = Release|x64
716+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Release|x86.ActiveCfg = Release|Any CPU
717+
{4B948597-3625-4B63-A272-2A9D8B37DC6D}.Release|x86.Build.0 = Release|Any CPU
578718
EndGlobalSection
579719
GlobalSection(SolutionProperties) = preSolution
580720
HideSolutionNode = FALSE

eng/Version.Details.xml

+12-8
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<Uri>https://github.com/dotnet/core-setup</Uri>
6464
<Sha>08e144c8651632da7bf1fbab409d27787ce6aa4a</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19323.4">
66+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19324.7">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
68+
<Sha>12508aec923685c972842c646349faf0f8991e86</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19323.4">
70+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19324.7">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
72+
<Sha>12508aec923685c972842c646349faf0f8991e86</Sha>
7373
</Dependency>
7474
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19320.1" CoherentParentDependency="Microsoft.NETCore.App">
7575
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -95,13 +95,17 @@
9595
<Uri>https://github.com/dotnet/coreclr</Uri>
9696
<Sha>8974a699899bdc2cc5687504e1ada606ac803e9b</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19323.4">
98+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19324.7">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
100+
<Sha>12508aec923685c972842c646349faf0f8991e86</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19323.4">
102+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19324.7">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>9946534da4f73e6242ca105f6798ab58119c9ab0</Sha>
104+
<Sha>12508aec923685c972842c646349faf0f8991e86</Sha>
105+
</Dependency>
106+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19324.7">
107+
<Uri>https://github.com/dotnet/arcade</Uri>
108+
<Sha>12508aec923685c972842c646349faf0f8991e86</Sha>
105109
</Dependency>
106110
</ToolsetDependencies>
107111
</Dependencies>

eng/Versions.props

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
</PropertyGroup>
4141
<!-- Packages that come from https://github.com/dotnet/arcade -->
4242
<PropertyGroup>
43-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19323.4</MicrosoftDotNetApiCompatVersion>
44-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19323.4</MicrosoftDotNetCodeAnalysisPackageVersion>
43+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.19324.7</MicrosoftDotNetApiCompatVersion>
44+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19324.7</MicrosoftDotNetCodeAnalysisPackageVersion>
45+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.19324.7</MicrosoftDotNetGenAPIVersion>
4546
</PropertyGroup>
4647
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
4748
<PropertyGroup>

eng/WpfArcadeSdk/Sdk/Sdk.props

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<Import Project="$(WpfArcadeSdkToolsDir)Signing.props" />
4141
<Import Project="$(WpfArcadeSdkToolsDir)CodeGen.props" />
4242
<Import Project="$(WpfArcadeSdkToolsDir)ApiCompat.props" />
43+
<Import Project="$(WpfArcadeSdkToolsDir)GenApi.props" />
4344

4445
<PropertyGroup>
4546
<DebugType>full</DebugType>

0 commit comments

Comments
 (0)