Skip to content

Commit c364cac

Browse files
committed
Context: dotnet/android-tools#196 Does It Build™?
1 parent c54222a commit c364cac

File tree

8 files changed

+24
-14
lines changed

8 files changed

+24
-14
lines changed

.gitmodules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
branch = 3.35.2
4141
[submodule "external/xamarin-android-tools"]
4242
path = external/xamarin-android-tools
43-
url = https://github.com/xamarin/xamarin-android-tools
44-
branch = main
43+
url = https://github.com/jonpryor/xamarin-android-tools
44+
branch = jonp-bump-nuget-versions-2022-10-27

Configuration.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
<!-- Unit Test Properties -->
245245
<PropertyGroup>
246246
<!-- When changing the version below, please also update the 'build-tools/scripts/nunit3-console*' scripts -->
247-
<NUnitConsoleVersion Condition=" '$(NUnitConsoleVersion)' == '' ">3.11.1</NUnitConsoleVersion>
247+
<NUnitConsoleVersion Condition=" '$(NUnitConsoleVersion)' == '' ">3.12.0</NUnitConsoleVersion>
248248
<_Runtime Condition=" '$(HostOS)' != 'Windows' ">$(ManagedRuntime) $(ManagedRuntimeArgs)</_Runtime>
249249
<_NUnit>$(_Runtime) $(XAPackagesDir)\nunit.consolerunner\$(NUnitConsoleVersion)\tools\nunit3-console.exe</_NUnit>
250250
</PropertyGroup>

Directory.Build.targets

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
3+
<!-- NuGet Package Versions -->
4+
<ItemGroup>
5+
<PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
6+
<PackageReference Update="System.CodeDom" Version="6.0.0" />
7+
<PackageReference Update="Irony" Version="1.1.0" />
8+
</ItemGroup>
9+
10+
</Project>
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project>
22
<!-- This file assumes Configuration.props has been imported -->
33
<ItemGroup>
4-
<PackageReference Include="NUnit" Version="3.12.0" />
4+
<PackageReference Include="NUnit" Version="3.13.2" />
55
<PackageReference Include="NUnit.ConsoleRunner" Version="$(NUnitConsoleVersion)" />
6-
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
6+
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
77
</ItemGroup>
88
<!-- Required packages for .NET Core -->
99
<ItemGroup Condition=" '$(TargetFramework)' != 'net472' and '$(TargetFramework)' != 'netstandard2.0' ">
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
11-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221003-04" />
11+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
1212
</ItemGroup>
1313
</Project>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</ItemGroup>
2727
<ItemGroup>
2828
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0" />
29-
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
29+
<PackageReference Include="Microsoft.Win32.Registry" />
3030
<ProjectReference Include="..\..\..\..\external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj">
3131
<Project>{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}</Project>
3232
<Name>Xamarin.Android.Tools.AndroidSdk</Name>

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<ItemGroup>
4141
<PackageReference Include="ILRepack" Version="2.0.18" />
42-
<PackageReference Include="Irony" Version="1.1.0" />
42+
<PackageReference Include="Irony" />
4343
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
4444
<PackageReference Include="NuGet.Common" Version="$(NuGetApiPackageVersion)" />
4545
<PackageReference Include="NuGet.Configuration" Version="$(NuGetApiPackageVersion)" />
@@ -51,8 +51,8 @@
5151
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetApiPackageVersion)" />
5252
<PackageReference Include="NuGet.Protocol" Version="$(NuGetApiPackageVersion)" />
5353
<PackageReference Include="NuGet.Versioning" Version="$(NuGetApiPackageVersion)" />
54-
<PackageReference Include="System.CodeDom" Version="4.7.0" />
55-
<PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
54+
<PackageReference Include="System.CodeDom" />
55+
<PackageReference Include="System.Reflection.Metadata" Version="6.0.1" />
5656
<PackageReference Include="System.Runtime" Version="4.3.1" />
5757
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
5858
<PackageReference Include="K4os.Hash.xxHash" Version="1.0.6" />

src/Xamarin.Android.Tools.Aidl/Xamarin.Android.Tools.Aidl.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Reference Include="Xamarin.Android.Cecil">
1212
<HintPath>$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Cecil.dll</HintPath>
1313
</Reference>
14-
<PackageReference Include="Irony" Version="1.1.0" />
15-
<PackageReference Include="System.CodeDom" Version="4.7.0" />
14+
<PackageReference Include="Irony" />
15+
<PackageReference Include="System.CodeDom" />
1616
</ItemGroup>
1717
</Project>

0 commit comments

Comments
 (0)