Skip to content
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.

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

Manual updates 20220215 (after 3 months) #575

Closed
wants to merge 43 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
47d3d4b
Update config.json
moljac Feb 15, 2022
e4689ad
initial bump for the updates
moljac Feb 16, 2022
c38b727
Update config.json
moljac Feb 21, 2022
f975fb7
update nuget versions for dependencies
moljac Feb 21, 2022
d571642
multi targeting fix
moljac Mar 17, 2022
9ddb851
Update config.json
moljac Mar 17, 2022
02a0c5a
new dependency javapoet
moljac Mar 17, 2022
1c7c923
version updates
moljac Mar 17, 2022
021829d
new dependency template - javapoet
moljac Mar 17, 2022
d86d03a
Create cgmanifest.json
moljac Mar 17, 2022
9072b9c
fixes
moljac Mar 17, 2022
fe01462
Update Directory.Build.targets
moljac Mar 17, 2022
8c6e623
Merge branch 'main' into mu-20220215
moljac Mar 25, 2022
884c854
Merge branch 'main' into mu-20220215
moljac Mar 25, 2022
c344061
Merge branch 'main' into mu-20220215
moljac Mar 25, 2022
8d07ef5
ZXing template
moljac Mar 29, 2022
4af36b0
ZXing metadata (source)
moljac Mar 29, 2022
ceaf0cf
SquareUp Javapoet metadata (source)
moljac Mar 29, 2022
489c2c4
Update config.json
moljac Mar 29, 2022
98257ff
Update config.json
moljac Mar 31, 2022
a9c7392
samples fixed for monoandroid12.0
moljac Mar 31, 2022
e90d3ec
monoandroid12.0
moljac Mar 31, 2022
3b0b17a
zxing legal stuff
moljac Mar 31, 2022
0c6940a
javapoet legal stuff
moljac Mar 31, 2022
116b187
long TFM net6.0-android31.0
moljac Mar 31, 2022
db0cc38
Merge branch 'main' into mu-20220215
moljac Apr 4, 2022
3bb5a01
samples fixed for MonoAndroid12.0
moljac Apr 4, 2022
9d8046f
Merge branch 'mu-20220215' of https://github.com/xamarin/GooglePlaySe…
moljac Apr 4, 2022
4c53d33
removed duplicates (manual merge fail)
moljac Apr 5, 2022
44d7360
namespace fixes
moljac Apr 5, 2022
62ec29c
AppINvite sample fix
moljac Apr 5, 2022
69d1ecf
namespace fix
moljac Apr 5, 2022
8143ff5
Merge branch 'main' into mu-20220215
moljac Apr 6, 2022
659192a
spell check updates
moljac Apr 6, 2022
a2849af
Merge branch 'mu-20220215' of https://github.com/xamarin/GooglePlaySe…
moljac Apr 6, 2022
fa689a7
binderator green
moljac Apr 8, 2022
eda48c5
attempt to work around nuget downgrade
moljac Apr 8, 2022
b4001b3
Merge branch 'main' into mu-20220215
moljac Apr 11, 2022
09d106a
Merge branch 'main' into mu-20220215
moljac Apr 15, 2022
3527017
Merge branch 'main' into mu-20220215
moljac Apr 21, 2022
824cc56
manual merge fix
moljac Apr 21, 2022
48427cb
Update config.json
moljac Apr 25, 2022
00e4ec1
binderator green
moljac Apr 25, 2022
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
41 changes: 32 additions & 9 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -542,23 +542,46 @@ Task("libs")
foreach(string config in Configs)
{
var settings = new DotNetMSBuildSettings()
.SetConfiguration(config)
.SetMaxCpuCount(MAX_CPU_COUNT)
.EnableBinaryLogger("./output/libs.binlog")
.WithProperty("NodeReuse", "false");
.SetConfiguration(config)
.SetMaxCpuCount(MAX_CPU_COUNT)
.EnableBinaryLogger("./output/libs.binlog");

settings.Properties.Add("DesignTimeBuild", new [] { "false" });
settings.Properties.Add("DesignTimeBuild", new [] { "false" });
settings.Properties.Add("AndroidSdkBuildToolsVersion", new [] { AndroidSdkBuildTools });

if (!string.IsNullOrEmpty(ANDROID_HOME))
{
settings.Properties.Add("AndroidSdkDirectory", new [] { $"{ANDROID_HOME}" } );
}

DotNetRestore("./generated/GooglePlayServices.sln", new DotNetRestoreSettings
{
MSBuildSettings = settings.EnableBinaryLogger("./output/restore.binlog")
});
try
{
DotNetRestore
(
"./generated/GooglePlayServices.sln",
new DotNetRestoreSettings
{
MSBuildSettings = settings.EnableBinaryLogger("./output/restore-1.binlog")
}
);
}
catch
{
Warning("############################################################################################");
Warning("running DotNetRestore 2nd time");
Warning(" https://github.com/NuGet/Home/issues/4681");
Warning(" https://github.com/NuGet/Home/issues/10741");
Warning(" https://github.com/NuGet/Home/issues/10127");
Warning("############################################################################################");
}
DotNetRestore
(
"./generated/GooglePlayServices.sln",
new DotNetRestoreSettings
{
MSBuildSettings = settings.EnableBinaryLogger("./output/restore-2.binlog")
}
);

DotNetMSBuild("./generated/GooglePlayServices.sln", settings);
}
Expand Down
Loading