Skip to content

[DO NOT MERGE] Manual updates 20230419 binderator update MavenNet #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moljac wants to merge 9 commits into from
Closed

[DO NOT MERGE] Manual updates 20230419 binderator update MavenNet #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bc0009
update TFMs
moljac Apr 19, 2023
8377311
visibility fixed instead of Theory
moljac Apr 29, 2023
2659952
version bump
moljac Apr 29, 2023
4af741b
version bump and license warning fixed
moljac Apr 29, 2023
43b277e
modernizing Binderator (removed net5.0 added net7.0)
moljac May 11, 2023
8364805
net7.0 for Binderator
moljac May 11, 2023
15bf0a6
binderator green
moljac May 15, 2023
5663b9b
automatic files
moljac May 15, 2023
481e7f4
Merge branch 'main' into mu-20230419-binderator
moljac May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,19 @@
},
"license": "The Apache Software License, Version 2.0"
},
{
"component": {
"type": "maven",
"maven": {
"artifactId": "annotation-jvm",
"groupId": "androidx.annotation",
"version": "1.6.0",
"nuGetId": "Xamarin.AndroidX.Annotation.Jvm",
"nuGetVersion": "1.6.0"
}
},
"license": "The Apache Software License, Version 2.0"
},
{
"component": {
"type": "maven",
Expand Down
8 changes: 8 additions & 0 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,14 @@
"nugetId": "Xamarin.AndroidX.Annotation",
"dependencyOnly": false
},
{
"groupId": "androidx.annotation",
"artifactId": "annotation-jvm",
"version": "1.6.0",
"nugetVersion": "1.6.0",
"nugetId": "Xamarin.AndroidX.Annotation.Jvm",
"dependencyOnly": false
},
{
"groupId": "androidx.annotation",
"artifactId": "annotation-experimental",
Expand Down
495 changes: 248 additions & 247 deletions docs/artifact-list.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"sdk":
{
"version": "6.0.403",
"version": "7.0.203",
"rollForward": "patch"
},
"msbuild-sdks":
{
"MSBuild.Sdk.Extras": "3.0.44",
"Microsoft.Build.Traversal": "3.2.0",
"Microsoft.Build.Traversal": "4.0.0",
"Microsoft.Build.NoTargets": "3.7.0",
"Xamarin.Legacy.Sdk": "0.2.0-alpha4"
}
Expand Down
2 changes: 1 addition & 1 deletion util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.Tests/GenerationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ public Task MetadataIsAppendedToDependencies()
</Project>");
}

public async Task ProcessAndAssertTemplate(string input, BindingConfig config, string output, Dictionary<string, string> metadata = null)
internal async Task ProcessAndAssertTemplate(string input, BindingConfig config, string output, Dictionary<string, string> metadata = null)
{
var generated = Path.Combine(RootDirectory, "generated");
var outputFile = Path.Combine(generated, "Generated.csproj");
Expand Down
6 changes: 3 additions & 3 deletions ...in.AndroidBinderator/Xamarin.AndroidBinderator.Tool/Xamarin.AndroidBinderator.Tool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<PackAsTool>true</PackAsTool>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net6.0;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<ToolCommandName>xamarin-android-binderator</ToolCommandName>
<AssemblyName>Xamarin.AndroidBinderator.Tool</AssemblyName>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand All @@ -13,11 +13,11 @@

<PropertyGroup>
<PackageId>Xamarin.AndroidBinderator.Tool</PackageId>
<PackageVersion>0.5.4</PackageVersion>
<PackageVersion>0.5.5</PackageVersion>
<Title>Xamarin Android Binderator</Title>
<PackageDescription>A tool for generating Xamarin.Android Binding projects from Razor templates and Maven Repository data.</PackageDescription>
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2100525</PackageProjectUrl>
<PackageLicenseUrl>https://go.microsoft.com/fwlink/?linkid=2100608</PackageLicenseUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Authors>Microsoft</Authors>
<Owners>Microsoft</Owners>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>2.3.4</PackageVersion>
<PackageVersion>2.3.5</PackageVersion>
<PackageId>Xamarin.AndroidBinderator</PackageId>
<Title>Xamarin.AndroidBinderator</Title>
<PackageDescription>An engine to generate Xamarin Binding projects from Maven repositories with a JSON config and razor templates.</PackageDescription>
Expand Down