DeGsoft
/
maui-linux
зеркало из https://github.com/DeGsoft/maui-linux.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Unify WinUI versions (#604)

This commit is contained in:
Matthew Leibowitz 2021-03-27 03:12:37 +02:00 коммит произвёл GitHub
Родитель ac9b08704a
Коммит 529f68d12d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 35 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
Просмотреть файл

@ -81,9 +81,9 @@
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers> <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true "> <ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion.Foundation" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion.WinUI" />
</ItemGroup> </ItemGroup>
<Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true "> <Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true ">
<PropertyGroup> <PropertyGroup>

16
eng/Microsoft.Extensions.targets
Просмотреть файл

@ -7,6 +7,9 @@
<_MicrosoftHostingVersion>5.0.0</_MicrosoftHostingVersion> <_MicrosoftHostingVersion>5.0.0</_MicrosoftHostingVersion>
<_MicrosoftDependencyInjectionVersion>5.0.1</_MicrosoftDependencyInjectionVersion> <_MicrosoftDependencyInjectionVersion>5.0.1</_MicrosoftDependencyInjectionVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<_MicrosoftProjectReunionVersion>0.5.0-prerelease</_MicrosoftProjectReunionVersion>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference <PackageReference
Update="Microsoft.Extensions.Configuration" Update="Microsoft.Extensions.Configuration"
@ -28,6 +31,17 @@
Update="Microsoft.Extensions.Logging" Update="Microsoft.Extensions.Logging"
Version="$(_MicrosoftHostingVersion)" Version="$(_MicrosoftHostingVersion)"
/> />
<PackageReference
Update="Microsoft.ProjectReunion"
Version="$(_MicrosoftProjectReunionVersion)"
/>
<PackageReference
Update="Microsoft.ProjectReunion.Foundation"
Version="$(_MicrosoftProjectReunionVersion)"
/>
<PackageReference
Update="Microsoft.ProjectReunion.WinUI"
Version="$(_MicrosoftProjectReunionVersion)"
/>
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/Compatibility/Core/src/Compatibility-net6.csproj
Просмотреть файл

@ -26,9 +26,9 @@
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true "> <ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion.Foundation" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion.WinUI" />
</ItemGroup> </ItemGroup>
<!--<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />--> <!--<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />-->

12
src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj
Просмотреть файл

@ -60,19 +60,19 @@
<!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...--> <!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...-->
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot> <NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot>
<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot> <NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot>
<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.5.0-prerelease'))</PkgMicrosoft_ProjectReunion> <PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '$(_MicrosoftProjectReunionVersion)'))</PkgMicrosoft_ProjectReunion>
<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.0.5.0-prerelease\</PkgMicrosoft_ProjectReunion> <PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.$(_MicrosoftProjectReunionVersion)\</PkgMicrosoft_ProjectReunion>
<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.5.0-prerelease'))</PkgMicrosoft_ProjectReunion_WinUI> <PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '$(_MicrosoftProjectReunionVersion)'))</PkgMicrosoft_ProjectReunion_WinUI>
<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.5.0-prerelease\</PkgMicrosoft_ProjectReunion_WinUI> <PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.$(_MicrosoftProjectReunionVersion)\</PkgMicrosoft_ProjectReunion_WinUI>
<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props> <Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
<Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets> <Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets>
<EntryPointProjectUniqueName>..\Controls.Sample.WinUI\Maui.Controls.Sample.WinUI.csproj</EntryPointProjectUniqueName> <EntryPointProjectUniqueName>..\Controls.Sample.WinUI\Maui.Controls.Sample.WinUI.csproj</EntryPointProjectUniqueName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.5.0-prerelease]" GeneratePathProperty="true"> <PackageReference Include="Microsoft.ProjectReunion" Version="[$(_MicrosoftProjectReunionVersion)]" GeneratePathProperty="true">
<ExcludeAssets>all</ExcludeAssets> <ExcludeAssets>all</ExcludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.5.0-prerelease]" GeneratePathProperty="true"> <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[$(_MicrosoftProjectReunionVersion)]" GeneratePathProperty="true">
<ExcludeAssets>all</ExcludeAssets> <ExcludeAssets>all</ExcludeAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

6
src/Controls/samples/Controls.Sample.WinUI/Maui.Controls.Sample.WinUI.csproj
Просмотреть файл

@ -9,9 +9,9 @@
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers> <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion.Foundation" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.5.0-prerelease" /> <PackageReference Include="Microsoft.ProjectReunion.WinUI" />
<Manifest Include="$(ApplicationManifest)" /> <Manifest Include="$(ApplicationManifest)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

5
src/Controls/samples/Controls.Sample/Maui.Controls.Sample-net6.csproj
Просмотреть файл

@ -18,6 +18,11 @@
<PackageReference Include="Microsoft.Extensions.Logging" /> <PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
<PackageReference Include="Microsoft.ProjectReunion" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\Essentials\src\Essentials-net6.csproj" /> <ProjectReference Include="..\..\..\Essentials\src\Essentials-net6.csproj" />