Skip to content

Commit

Permalink
尝试加上版本文件和更多项目
Browse files Browse the repository at this point in the history
  • Loading branch information
lindexi committed Oct 19, 2024
1 parent e4e8922 commit 02a9f66
Show file tree
Hide file tree
Showing 3 changed files with 118 additions and 2 deletions.
14 changes: 14 additions & 0 deletions WPFDemo/WpfReorganize/WPF/Microsoft.Dotnet.Wpf.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml", "src\Microsof
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfDemo", "..\Demo\WpfDemo\WpfDemo.csproj", "{051AAAD5-B79D-4941-B6FA-4D344BCB3BB2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsBase", "src\Microsoft.DotNet.Wpf\src\WindowsBase\WindowsBase.csproj", "{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -41,6 +43,18 @@ Global
{051AAAD5-B79D-4941-B6FA-4D344BCB3BB2}.Release|arm64.Build.0 = Release|Any CPU
{051AAAD5-B79D-4941-B6FA-4D344BCB3BB2}.Release|x64.ActiveCfg = Release|Any CPU
{051AAAD5-B79D-4941-B6FA-4D344BCB3BB2}.Release|x64.Build.0 = Release|Any CPU
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|arm64.ActiveCfg = Debug|arm64
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|arm64.Build.0 = Debug|arm64
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|x64.ActiveCfg = Debug|x64
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Debug|x64.Build.0 = Debug|x64
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|Any CPU.Build.0 = Release|Any CPU
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|arm64.ActiveCfg = Release|arm64
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|arm64.Build.0 = Release|arm64
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x64.ActiveCfg = Release|x64
{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
102 changes: 102 additions & 0 deletions WPFDemo/WpfReorganize/WPF/eng/Versions.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MajorVersion>8</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<!--
Set assembly version to align with major and minor version, as for the patches and revisions should be manually
updated per assembly if it is serviced.
Note, any components that aren't exposed as references in the targeting pack (like analyzers/generators) those should rev
so that they can exist SxS, as the compiler relies on different version to change assembly version for caching purposes.
NOTE: WPF does not currently have any public analyzers or source generators. When these are added please check how
dotnet/winforms is handling versions for the analyzers.
-->
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>8.0.0-rc.1.23410.2</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.1.23409.17</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-rc.1.23409.17</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-rc.1.23409.17</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.0-rc.1.23409.17</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>8.0.0-rc.1.23409.17</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>8.0.0-rc.1.23409.17</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>8.0.0-rc.1.23409.17</SystemDiagnosticsEventLogPackageVersion>
<SystemDrawingCommonVersion>8.0.0-rc.1.23410.2</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>8.0.0-rc.1.23409.17</SystemDirectoryServicesVersion>
<SystemIOPackagingVersion>8.0.0-rc.1.23409.17</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.0-rc.1.23409.17</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemResourcesExtensionsVersion>8.0.0-rc.1.23409.17</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyXmlPackageVersion>8.0.0-rc.1.23409.17</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>8.0.0-rc.1.23409.17</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>8.0.0-rc.1.23409.17</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Docs / Intellisense -->
<PropertyGroup>
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20221010.1</MicrosoftPrivateIntellisenseVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.23409.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>8.0.0-beta.23409.5</MicrosoftDotNetCodeAnalysisPackageVersion>
</PropertyGroup>
<!-- Sourcelink -->
<PropertyGroup>
<MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubVersion>
<MicrosoftSourceLinkAzureReposGitVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitVersion>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
<PropertyGroup>
<SystemCodeDomPackageVersionForPresentationBuildTasks>4.5.0</SystemCodeDomPackageVersionForPresentationBuildTasks>
</PropertyGroup>
<!-- Other Packages that require manual updating-->
<PropertyGroup>
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<XUnitVersion>2.4.0</XUnitVersion>
<XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
<XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
<!--
Also in global.json
Used in Wpf.Cpp.PrivateTools.props/targets
<MsvcurtC1xxVersion>0.0.1.2</MsvcurtC1xxVersion>
-->
<!--
This is the version of the test infrastructure package is compiled against. This should be
removed as part of https://github.com/dotnet/wpf/issues/816
-->
<MicrosoftDotNetWpfTestPackageVersion>1.0.0-beta.19263.1</MicrosoftDotNetWpfTestPackageVersion>
<!-- These versions are specified in global.json -->
<StrawberryPerlVersion>5.28.1.1-1</StrawberryPerlVersion>
<NetFramework48RefAssembliesVersion>0.0.0.1</NetFramework48RefAssembliesVersion>
</PropertyGroup>
<!-- External Analyzers -->
<PropertyGroup>
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
</PropertyGroup>
<!--Package names-->
<PropertyGroup>
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
<MicrosoftPrivateWinformsPackage>Microsoft.Private.Winforms</MicrosoftPrivateWinformsPackage>
<SystemDrawingCommonPackage>System.Drawing.Common</SystemDrawingCommonPackage>
<SystemDirectoryServicesPackage>System.DirectoryServices</SystemDirectoryServicesPackage>
<MicrosoftDotNetWpfDncEngPackage>Microsoft.DotNet.Wpf.DncEng</MicrosoftDotNetWpfDncEngPackage>
<SystemIOPackagingPackage>System.IO.Packaging</SystemIOPackagingPackage>
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetWpfDncEngVersion>8.0.0-rc.1.23368.2</MicrosoftDotNetWpfDncEngVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,11 @@
<NetCoreReference Include="System.Security.Principal.Windows" />
<NetCoreReference Include="System.Text.Encoding.Extensions" />
<NetCoreReference Include="System.Threading" />
<NetCoreReference Include="System.Threading.Tasks" />
<!--<NetCoreReference Include="System.Threading.Tasks" />-->
<NetCoreReference Include="System.Threading.Thread" />
<NetCoreReference Include="System.Threading.ThreadPool" />
<NetCoreReference Include="System.Threading.Timer" />
<NetCoreReference Include="System.Xml" />
<!--<NetCoreReference Include="System.Xml" />-->
<NetCoreReference Include="System.Xml.Document" />
<NetCoreReference Include="System.Xml.ReaderWriter" />
<MicrosoftPrivateWinFormsReference Include="Accessibility" />
Expand Down

0 comments on commit 02a9f66

Please sign in to comment.