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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 6 additions & 0 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 5 additions & 0 deletions
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

Lines changed: 5 additions & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 5 additions & 0 deletions
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

Lines changed: 7 additions & 3 deletions
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]

0 commit comments

Comments
 (0)