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

Housekeeping Update packages fix build (#3411)

This commit is contained in:
Chris Pulman 2022-11-06 05:32:24 +00:00 коммит произвёл GitHub
Родитель 28a4d9d32a
Коммит 16f867c553
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 27 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
integrationtests/Directory.Build.props
Просмотреть файл

@ -27,7 +27,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.435" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="4.1.1" PrivateAssets="All" />
<PackageReference Include="Roslynator.Analyzers" Version="4.1.2" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)..\src\stylecop.json" Link="stylecop.json" />

4
integrationtests/IntegrationTests.Android/IntegrationTests.Android.csproj
Просмотреть файл

@ -99,8 +99,8 @@
<AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Android.Support.Design" Version="27.*" />
<PackageReference Include="Xamarin.AndroidX.Media" Version="1.2.0" />
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.AndroidX.Media" Version="1.6.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\ReactiveUI.AndroidX\ReactiveUI.AndroidX.csproj">

9
integrationtests/IntegrationTests.Mac/IntegrationTests.Mac.csproj
Просмотреть файл

@ -50,7 +50,12 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="Xamarin.Mac">
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
<HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@ -96,4 +101,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
</Project>
</Project>

2
integrationtests/IntegrationTests.Shared.Tests/IntegrationTests.Shared.Tests.csproj
Просмотреть файл

@ -19,7 +19,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
<PackageReference Include="FluentAssertions" Version="6.7.0" />
<PackageReference Include="FluentAssertions" Version="6.8.0" />
</ItemGroup>
<ItemGroup>

8
integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj
Просмотреть файл

@ -51,7 +51,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.2.0.564" />
<PackageReference Include="Xamarin.AndroidX.Media" Version="1.2.0" />
<PackageReference Include="Xamarin.AndroidX.Core">
<Version>1.7.0.2</Version>
</PackageReference>
<PackageReference Include="Xamarin.AndroidX.Media" Version="1.6.0" />
<PackageReference Include="Xamarin.Jetbrains.Annotations" Version="23.0.0.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@ -99,4 +103,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
</Project>

2
src/Directory.build.props
Просмотреть файл

@ -52,7 +52,7 @@
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
<PackageReference Include="coverlet.msbuild" Version="3.2.0" PrivateAssets="All" />
<PackageReference Include="Verify.Xunit" Version="18.2.1" />
<PackageReference Include="Verify.Xunit" Version="18.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(IsTestProject)' != 'true'">

10
src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj
Просмотреть файл

@ -28,11 +28,11 @@
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid12'))">
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.8.0.1" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.0.2" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.15" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1.2" />
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0.1" />
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.0.3" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.16" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.7.0.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1.1" />
</ItemGroup>
<ItemGroup>

2
src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj
Просмотреть файл

@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('net6')) ">
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.10" />
</ItemGroup>
<ItemGroup>

2
src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
Просмотреть файл

@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Fody" Version="6.6.4" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="6.6.3" PrivateAssets="All" />
<PackageReference Include="FodyPackaging" Version="6.6.4" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">

2
src/ReactiveUI.XamForms.Tests/Activation/ActivatingReactivePagesTests.cs
Просмотреть файл

@ -17,7 +17,7 @@ namespace ReactiveUI.Tests
/// </summary>
public class ActivatingReactivePagesTests : IClassFixture<ApplicationFixture<App>>
{
private ApplicationFixture<App> _fixture;
private readonly ApplicationFixture<App> _fixture;
/// <summary>
/// Initializes a new instance of the <see cref="ActivatingReactivePagesTests"/> class.

2
src/ReactiveUI/Platforms/android/ControlFetcherMixin.cs
Просмотреть файл

@ -23,7 +23,7 @@ public static partial class ControlFetcherMixin
{
private static readonly ConcurrentDictionary<Assembly, Dictionary<string, int>> _controlIds = new();
private static readonly ConditionalWeakTable<object, Dictionary<string?, View?>> _viewCache = new();
private static readonly ConditionalWeakTable<object, Dictionary<string, View?>> _viewCache = new();
/// <summary>
/// Gets the control from an activity.