Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit c2e3b37

Browse files
RedthRedth
authored
Merge pull request #101 from xamarin/27.x
27.0.2
2 parents 0a1da9d + 0db081f commit c2e3b37

File tree

89 files changed

+918
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+918
-172
lines changed

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ docs/
1717
*.xcuserstate
1818
*.xcuserstate
1919
*.csproj.user
20-
*/nuget/*.targets
21-
*/nuget/*.nuspec
20+
**/nuget/*.targets
21+
**/nuget/*.nuspec
2222
!merge.targets
2323
!template.targets
2424
!template.nuspec

‎AndroidSupport.sln

+6
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "a
7575
EndProject
7676
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
7777
EndProject
78+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content", "support-content\source\Content.csproj", "{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}"
79+
EndProject
7880
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Core.Runtime", "arch-core\runtime\source\Arch.Core.Runtime.csproj", "{4C9E1C1E-09C3-469C-B3C2-79651DF13871}"
7981
EndProject
8082
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Extensions", "arch-lifecycle\extensions\source\Arch.Lifecycle.Extensions.csproj", "{8DFA4E1A-7DF0-4FC5-A8F3-8E6E30E3DA70}"
@@ -229,6 +231,10 @@ Global
229231
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
230232
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
231233
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
234+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
235+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Debug|Any CPU.Build.0 = Debug|Any CPU
236+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Release|Any CPU.ActiveCfg = Release|Any CPU
237+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Release|Any CPU.Build.0 = Release|Any CPU
232238
{4C9E1C1E-09C3-469C-B3C2-79651DF13871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
233239
{4C9E1C1E-09C3-469C-B3C2-79651DF13871}.Debug|Any CPU.Build.0 = Debug|Any CPU
234240
{4C9E1C1E-09C3-469C-B3C2-79651DF13871}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎animated-vector-drawable/nuget/template.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<licenseUrl>https://go.microsoft.com/fwlink/?linkid=865381</licenseUrl>
1414
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/animated-vector-drawable_128x128.png</iconUrl>
1515
<dependencies>
16-
<group targetFramework="MonoAndroid80">
16+
<group targetFramework="MonoAndroid81">
1717
<dependency id="Xamarin.Android.Support.Vector.Drawable" version="[$version$]" />
1818
</group>
1919
</dependencies>
2020
</metadata>
2121
<files>
22-
<file src="animated-vector-drawable/nuget/Xamarin.Android.Support.Animated.Vector.Drawable.targets" target="build/MonoAndroid80" />
23-
<file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib/MonoAndroid80" />
22+
<file src="animated-vector-drawable/nuget/Xamarin.Android.Support.Animated.Vector.Drawable.targets" target="build/MonoAndroid81" />
23+
<file src="output/Xamarin.Android.Support.Animated.Vector.Drawable.dll" target="lib/MonoAndroid81" />
2424
<file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
2525
</files>
2626
</package>

‎animated-vector-drawable/source/Properties/AssemblyInfo.cs

+4
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@
2323
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2424
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
2525
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
26+
27+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
28+
29+
[assembly: Android.LinkerSafe]

‎appcompat-v7/nuget/template.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<licenseUrl>https://go.microsoft.com/fwlink/?linkid=865381</licenseUrl>
1414
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/v7-appcompat_128x128.png</iconUrl>
1515
<dependencies>
16-
<group targetFramework="MonoAndroid80">
16+
<group targetFramework="MonoAndroid81">
1717
<dependency id="Xamarin.Android.Support.Vector.Drawable" version="[$version$]" />
1818
<dependency id="Xamarin.Android.Support.Animated.Vector.Drawable" version="[$version$]" />
1919
<!-- Support V4 -->
@@ -26,8 +26,8 @@
2626
</dependencies>
2727
</metadata>
2828
<files>
29-
<file src="appcompat-v7/nuget/Xamarin.Android.Support.v7.AppCompat.targets" target="build/MonoAndroid80" />
30-
<file src="output/Xamarin.Android.Support.v7.AppCompat.dll" target="lib/MonoAndroid80" />
29+
<file src="appcompat-v7/nuget/Xamarin.Android.Support.v7.AppCompat.targets" target="build/MonoAndroid81" />
30+
<file src="output/Xamarin.Android.Support.v7.AppCompat.dll" target="lib/MonoAndroid81" />
3131
<file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
3232
</files>
3333
</package>

‎appcompat-v7/source/Properties/AssemblyInfo.cs

+5
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
// if desired. See the Mono documentation for more information about signing.
2222
//[assembly: AssemblyDelaySign(false)]
2323
//[assembly: AssemblyKeyFile("")]
24+
2425
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2526
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
2627
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
28+
29+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
30+
31+
[assembly: Android.LinkerSafe]

‎arch-core/common/source/Properties/AssemblyInfo.cs

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525

2626
//[assembly: AssemblyDelaySign(false)]
2727
//[assembly: AssemblyKeyFile("")]
28+
2829
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2930
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
3031
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
32+
33+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
34+
35+
[assembly: Android.LinkerSafe]

‎arch-core/runtime/source/Arch.Core.Runtime.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
<Folder Include="Jars\" />
6969
</ItemGroup>
7070
<ItemGroup>
71-
<EmbeddedJar Include="..\..\..\externals\arch-core\arch-core-runtime.aar">
71+
<LibraryProjectZip Include="..\..\..\externals\arch-core\arch-core-runtime.aar">
7272
<Link>arch-core-runtime.aar</Link>
73-
</EmbeddedJar>
73+
</LibraryProjectZip>
7474
</ItemGroup>
7575
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
7676

‎arch-lifecycle/common/source/Properties/AssemblyInfo.cs

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525

2626
//[assembly: AssemblyDelaySign(false)]
2727
//[assembly: AssemblyKeyFile("")]
28+
2829
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2930
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
3031
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
32+
33+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
34+
35+
[assembly: Android.LinkerSafe]

‎arch-lifecycle/extensions/source/Properties/AssemblyInfo.cs

+7-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525

2626
//[assembly: AssemblyDelaySign(false)]
2727
//[assembly: AssemblyKeyFile("")]
28-
[assembly: AssemblyMetadata("BUILD_COMMIT", "{BUILD_COMMIT}")]
29-
[assembly: AssemblyMetadata("BUILD_NUMBER", "{BUILD_NUMBER}")]
30-
[assembly: AssemblyMetadata("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
28+
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
29+
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
30+
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
31+
32+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
33+
34+
[assembly: Android.LinkerSafe]

‎arch-lifecycle/runtime/source/Properties/AssemblyInfo.cs

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525

2626
//[assembly: AssemblyDelaySign(false)]
2727
//[assembly: AssemblyKeyFile("")]
28+
2829
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2930
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
3031
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
32+
33+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
34+
35+
[assembly: Android.LinkerSafe]

‎build.cake

+70-44
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,51 @@ var BUILD_CONFIG = Argument ("config", "Release");
4141
// Master list of all the packages in the repo:
4242
// https://dl.google.com/dl/android/maven2/master-index.xml
4343

44-
var NUGET_VERSION = "26.1.0.2";
45-
var COMPONENT_VERSION = "26.1.0.0";
46-
var AAR_VERSION = "26.1.0";
47-
var DOC_VERSION = "2017-10-02";
44+
var NUGET_PRE = "";
45+
46+
var NUGET_VERSION = "27.0.2" + NUGET_PRE;
47+
var COMPONENT_VERSION = "27.0.2.0";
48+
var AAR_VERSION = "27.0.2";
49+
50+
var ARCH_CORE_COMMON_AAR_VERSION = "1.0.0";
51+
var ARCH_CORE_RUNTIME_AAR_VERSION = "1.0.0";
52+
var ARCH_LIFECYCLE_COMMON_AAR_VERSION = "1.0.3";
53+
var ARCH_LIFECYCLE_RUNTIME_AAR_VERSION = "1.0.3";
54+
var ARCH_LIFECYCLE_EXTENSIONS_AAR_VERSION = "1.0.0";
55+
56+
var ARCH_CORE_COMMON_NUGET_VERSION = "1.0.0" + NUGET_PRE;
57+
var ARCH_CORE_RUNTIME_NUGET_VERSION = "1.0.0" + NUGET_PRE;
58+
var ARCH_LIFECYCLE_COMMON_NUGET_VERSION = "1.0.3" + NUGET_PRE;
59+
var ARCH_LIFECYCLE_RUNTIME_NUGET_VERSION = "1.0.3" + NUGET_PRE;
60+
var ARCH_LIFECYCLE_EXTENSIONS_NUGET_VERSION = "1.0.0" + NUGET_PRE;
61+
62+
63+
var DOC_VERSION = "2017-12-18";
4864

4965
var SUPPORT_PKG_NAME = "com.android.support";
5066
var ARCH_LIFECYCLE_PKG_NAME = "android.arch.lifecycle";
5167
var ARCH_CORE_PKG_NAME = "android.arch.core";
5268

5369
// FROM: https://dl.google.com/android/repository/addon2-1.xml
5470
var MAVEN_REPO_URL = "https://dl.google.com/dl/android/maven2/";
55-
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r26-macosx.zip";
71+
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r27-macosx.zip";
5672
var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v8.0" : "android-26";
57-
var RENDERSCRIPT_FOLDER = "android-8.0.0";
73+
var RENDERSCRIPT_FOLDER = "android-8.1.0";
74+
var REFERENCE_DOCS_URL = "https://developer.android.com/reference/";
75+
var REFERENCE_DOCS_PACKAGELIST_URL = REFERENCE_DOCS_URL + "android/support/package-list";
5876

5977
// We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff
60-
var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/25.4.0.2/api-info.xml";
78+
var BASE_API_INFO_URL = EnvironmentVariable("MONO_API_INFO_XML_URL") ?? "https://github.com/xamarin/AndroidSupportComponents/releases/download/26.1.0/api-info.xml";
6179

62-
var CPU_COUNT = System.Environment.ProcessorCount;
80+
var CPU_COUNT = 1;
6381
var USE_MSBUILD_ON_MAC = true;
6482

65-
// MSBUILD has issues on *nix/osx with a different CPU Count being specified
66-
if (!IsRunningOnWindows())
67-
CPU_COUNT = 1;
68-
6983
var ARTIFACTS = new [] {
70-
new ArtifactInfo (ARCH_CORE_PKG_NAME, "common", "Xamarin.Android.Arch.Core.Common", "1.0.0", "1.0.0", "1.0.0.0", true) { PathPrefix = "arch-core/" },
71-
new ArtifactInfo (ARCH_CORE_PKG_NAME, "runtime", "Xamarin.Android.Arch.Core.Runtime", "1.0.0", "1.0.0", "1.0.0.0") { PathPrefix = "arch-core/" },
72-
new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "common", "Xamarin.Android.Arch.Lifecycle.Common", "1.0.3", "1.0.3", "1.0.3.0", true) { PathPrefix = "arch-lifecycle/" },
73-
new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "runtime", "Xamarin.Android.Arch.Lifecycle.Runtime", "1.0.3", "1.0.3", "1.0.3.0") { PathPrefix = "arch-lifecycle/" },
74-
new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "extensions", "Xamarin.Android.Arch.Lifecycle.Extensions", "1.0.0", "1.0.0", "1.0.0.0") { PathPrefix = "arch-lifecycle/" },
84+
new ArtifactInfo (ARCH_CORE_PKG_NAME, "common", "Xamarin.Android.Arch.Core.Common", ARCH_CORE_COMMON_AAR_VERSION, ARCH_CORE_COMMON_NUGET_VERSION, "1.0.0.0", true) { PathPrefix = "arch-core/" },
85+
new ArtifactInfo (ARCH_CORE_PKG_NAME, "runtime", "Xamarin.Android.Arch.Core.Runtime", ARCH_CORE_RUNTIME_AAR_VERSION, ARCH_CORE_RUNTIME_NUGET_VERSION, "1.0.0.0") { PathPrefix = "arch-core/" },
86+
new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "common", "Xamarin.Android.Arch.Lifecycle.Common", ARCH_LIFECYCLE_COMMON_AAR_VERSION, ARCH_LIFECYCLE_COMMON_NUGET_VERSION, "1.0.3.0", true) { PathPrefix = "arch-lifecycle/" },
87+
new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "runtime", "Xamarin.Android.Arch.Lifecycle.Runtime", ARCH_LIFECYCLE_RUNTIME_AAR_VERSION, ARCH_LIFECYCLE_RUNTIME_NUGET_VERSION, "1.0.3.0") { PathPrefix = "arch-lifecycle/" },
88+
new ArtifactInfo (ARCH_LIFECYCLE_PKG_NAME, "extensions", "Xamarin.Android.Arch.Lifecycle.Extensions", ARCH_LIFECYCLE_EXTENSIONS_AAR_VERSION, ARCH_LIFECYCLE_EXTENSIONS_NUGET_VERSION, "1.0.0.0") { PathPrefix = "arch-lifecycle/" },
7589

7690
//new ArtifactInfo (SUPPORT_PKG_NAME, "support-v4", "Xamarin.Android.Support.v4", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7791
new ArtifactInfo (SUPPORT_PKG_NAME, "support-v13", "Xamarin.Android.Support.v13", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
@@ -92,6 +106,7 @@ var ARTIFACTS = new [] {
92106
new ArtifactInfo (SUPPORT_PKG_NAME, "animated-vector-drawable", "Xamarin.Android.Support.Animated.Vector.Drawable", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
93107
new ArtifactInfo (SUPPORT_PKG_NAME, "support-vector-drawable", "Xamarin.Android.Support.Vector.Drawable", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
94108
new ArtifactInfo (SUPPORT_PKG_NAME, "support-compat", "Xamarin.Android.Support.Compat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
109+
new ArtifactInfo (SUPPORT_PKG_NAME, "support-content", "Xamarin.Android.Support.Content", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
95110
new ArtifactInfo (SUPPORT_PKG_NAME, "support-core-utils", "Xamarin.Android.Support.Core.Utils", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
96111
new ArtifactInfo (SUPPORT_PKG_NAME, "support-core-ui", "Xamarin.Android.Support.Core.UI", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
97112
new ArtifactInfo (SUPPORT_PKG_NAME, "support-dynamic-animation", "Xamarin.Android.Support.Dynamic.Animation", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
@@ -128,6 +143,7 @@ class ArtifactInfo
128143
NuGetVersion = nugetVersion;
129144
ComponentVersion = componentVersion;
130145
IsJar = isJar;
146+
PathPrefix = string.Empty;
131147
}
132148

133149
public string Package { get; set; }
@@ -141,8 +157,10 @@ class ArtifactInfo
141157
}
142158

143159
var MONODROID_PATH = "/Library/Frameworks/Xamarin.Android.framework/Versions/Current/lib/mandroid/platforms/" + ANDROID_SDK_VERSION + "/";
144-
if (IsRunningOnWindows ())
145-
MONODROID_PATH = MakeAbsolute (new DirectoryPath (Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86)).Combine ("Reference Assemblies/Microsoft/Framework/MonoAndroid/" + ANDROID_SDK_VERSION +"/")).FullPath;
160+
if (IsRunningOnWindows ()) {
161+
var vsInstallPath = VSWhereLatest (new VSWhereLatestSettings { Requires = "Component.Xamarin" });
162+
MONODROID_PATH = vsInstallPath.Combine ("Common7/IDE/ReferenceAssemblies/Microsoft/Framework/MonoAndroid/" + ANDROID_SDK_VERSION).FullPath;
163+
}
146164

147165
var MSCORLIB_PATH = "/Library/Frameworks/Xamarin.Android.framework/Libraries/mono/2.1/";
148166
if (IsRunningOnWindows ()) {
@@ -155,6 +173,9 @@ if (IsRunningOnWindows ()) {
155173
MSCORLIB_PATH = MakeAbsolute (DOTNETDIR.Combine("Framework/v4.0.30319/")).FullPath;
156174
}
157175

176+
Information ("MONODROID_PATH: {0}", MONODROID_PATH);
177+
Information ("MSCORLIB_PATH: {0}", MSCORLIB_PATH);
178+
158179
var nugetInfos = ARTIFACTS.Select (a => new NuGetInfo { NuSpec = "./" + a.PathPrefix + a.ArtifactId + "/nuget/" + a.NugetId + ".nuspec", Version = a.NuGetVersion, RequireLicenseAcceptance = true }).ToList ();
159180
nugetInfos.Add (new NuGetInfo { NuSpec = "./support-v4/nuget/Xamarin.Android.Support.v4.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true });
160181

@@ -424,6 +445,32 @@ Task ("nuget-setup")
424445
}
425446
});
426447

448+
Task ("ci-setup")
449+
.WithCriteria (!BuildSystem.IsLocalBuild)
450+
.Does (() =>
451+
{
452+
var buildCommit = "DEV";
453+
var buildNumber = "DEBUG";
454+
var buildTimestamp = DateTime.UtcNow.ToString ();
455+
456+
if (BuildSystem.IsRunningOnJenkins) {
457+
buildNumber = BuildSystem.Jenkins.Environment.Build.BuildTag;
458+
buildCommit = EnvironmentVariable("GIT_COMMIT") ?? buildCommit;
459+
} else if (BuildSystem.IsRunningOnVSTS) {
460+
buildNumber = BuildSystem.TFBuild.Environment.Build.Number;
461+
buildCommit = BuildSystem.TFBuild.Environment.Repository.SourceVersion;
462+
}
463+
464+
foreach (var art in ARTIFACTS) {
465+
var glob = "./" + art.PathPrefix + art.ArtifactId + "/**/source/**/AssemblyInfo.cs";
466+
467+
ReplaceTextInFiles(glob, "{NUGET_VERSION}", art.NuGetVersion);
468+
ReplaceTextInFiles(glob, "{BUILD_COMMIT}", buildCommit);
469+
ReplaceTextInFiles(glob, "{BUILD_NUMBER}", buildNumber);
470+
ReplaceTextInFiles(glob, "{BUILD_TIMESTAMP}", buildTimestamp);
471+
}
472+
});
473+
427474
Task ("component-setup")
428475
.Does (() =>
429476
{
@@ -570,15 +617,15 @@ Task ("droiddocs")
570617

571618
if (!FileExists(compressedDocsFile)) {
572619
if (IsRunningOnWindows ())
573-
StartProcess ("util/droiddocs.exe", "scrape --out ./docs --url https://developer.android.com/reference/ --package-filter \"android.support\"");
620+
StartProcess ("util/droiddocs.exe", "scrape --out ./docs --url " + REFERENCE_DOCS_URL + " --package-list-source " + REFERENCE_DOCS_PACKAGELIST_URL + " --package-filter \"android.support\"");
574621
else
575-
StartProcess ("mono", "util/droiddocs.exe scrape --out ./docs --url https://developer.android.com/reference/ --package-filter \"android.support\"");
622+
StartProcess ("mono", "util/droiddocs.exe scrape --out ./docs --url " + REFERENCE_DOCS_URL + " --package-list-source " + REFERENCE_DOCS_PACKAGELIST_URL + " --package-filter \"android.support\"");
576623

577624
// Scraper misses a few files we require
578625
EnsureDirectoryExists("./docs/reference");
579-
DownloadFile("https://developer.android.com/reference/classes.html", "./docs/reference/classes.html");
626+
DownloadFile(REFERENCE_DOCS_URL + "classes.html", "./docs/reference/classes.html");
580627
CopyFile ("./docs/reference/classes.html", "./docs/reference/index.html");
581-
DownloadFile("https://developer.android.com/reference/packages.html", "./docs/reference/packages.html");
628+
DownloadFile(REFERENCE_DOCS_URL + "packages.html", "./docs/reference/packages.html");
582629

583630

584631
ZipCompress ("./docs", compressedDocsFile);
@@ -596,27 +643,6 @@ Task ("droiddocs")
596643
}
597644
});
598645

599-
Task ("ci-setup")
600-
.WithCriteria (!BuildSystem.IsLocalBuild)
601-
.Does (() =>
602-
{
603-
var buildCommit = "DEV";
604-
var buildNumber = "DEBUG";
605-
var buildTimestamp = DateTime.UtcNow.ToString ();
606-
607-
if (BuildSystem.IsRunningOnJenkins) {
608-
buildNumber = BuildSystem.Jenkins.Environment.Build.BuildTag;
609-
buildCommit = EnvironmentVariable("GIT_COMMIT") ?? buildCommit;
610-
} else if (BuildSystem.IsRunningOnVSTS) {
611-
buildNumber = BuildSystem.TFBuild.Environment.Build.Number;
612-
buildCommit = BuildSystem.TFBuild.Environment.Repository.SourceVersion;
613-
}
614-
615-
ReplaceTextInFiles("./**/source/**/AssemblyInfo.cs", "{BUILD_COMMIT}", buildCommit);
616-
ReplaceTextInFiles("./**/source/**/AssemblyInfo.cs", "{BUILD_NUMBER}", buildNumber);
617-
ReplaceTextInFiles("./**/source/**/AssemblyInfo.cs", "{BUILD_TIMESTAMP}", buildTimestamp);
618-
});
619-
620646
Task ("clean")
621647
.IsDependentOn ("clean-base")
622648
.Does (() =>

‎cardview-v7/nuget/template.nuspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<licenseUrl>https://go.microsoft.com/fwlink/?linkid=865381</licenseUrl>
1414
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/cardview_128x128.png</iconUrl>
1515
<dependencies>
16-
<group targetFramework="MonoAndroid80">
16+
<group targetFramework="MonoAndroid81">
1717
<dependency id="Xamarin.Android.Support.Annotations" version="[$version$]" />
1818
</group>
1919
</dependencies>
2020
</metadata>
2121
<files>
22-
<file src="cardview-v7/nuget/Xamarin.Android.Support.v7.CardView.targets" target="build/MonoAndroid80" />
23-
<file src="output/Xamarin.Android.Support.v7.CardView.dll" target="lib/MonoAndroid80" />
22+
<file src="cardview-v7/nuget/Xamarin.Android.Support.v7.CardView.targets" target="build/MonoAndroid81" />
23+
<file src="output/Xamarin.Android.Support.v7.CardView.dll" target="lib/MonoAndroid81" />
2424
<file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
2525
</files>
2626
</package>

‎cardview-v7/source/Properties/AssemblyInfo.cs

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
// if desired. See the Mono documentation for more information about signing.
2121
//[assembly: AssemblyDelaySign(false)]
2222
//[assembly: AssemblyKeyFile("")]
23+
2324
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2425
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
2526
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
27+
28+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
29+
30+
[assembly: Android.LinkerSafe]

‎constraint-layout-solver/source/Properties/AssemblyInfo.cs

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
2020

2121
[assembly: AssemblyVersion ("1.1.0.0")]
22+
2223
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2324
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
2425
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
26+
27+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
28+
29+
[assembly: Android.LinkerSafe]

‎constraint-layout/source/Properties/AssemblyInfo.cs

+4
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@
2323
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
2424
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
2525
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
26+
27+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
28+
29+
[assembly: Android.LinkerSafe]

0 commit comments

Comments
 (0)