Skip to content

Reorganize attributes #60

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

Merged
jonpryor merged 2 commits into from
Aug 4, 2016
Merged

Reorganize attributes #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5583d26
Reorganize Xamarin.Android.NamingCustomAttributes.shproj (i.e. Attrib…
atsushieno Aug 2, 2016
bd53e10
Remove extraneous attribute members.
atsushieno Aug 2, 2016
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
4 changes: 2 additions & 2 deletions Java.Interop.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build-Tools", "Build-Tools"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jnienv-gen", "build-tools\jnienv-gen\jnienv-gen.csproj", "{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Android.NamingCustomAttributes", "src\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.shproj", "{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076}"
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Java.Interop.NamingCustomAttributes", "src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.shproj", "{FE789F04-5E95-42C5-AEF1-E33F8DF06B3F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaCallableWrappers", "src\Java.Interop.Tools.JavaCallableWrappers\Java.Interop.Tools.JavaCallableWrappers.csproj", "{D18FCF91-8876-48A0-A693-2DC1E7D3D80A}"
EndProject
Expand Down Expand Up @@ -348,7 +348,7 @@ Global
{4EEAB1A7-99C1-4302-9C18-01A7B481409B} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{F3ECB73D-9263-4E42-A5B4-3FC0D1D829F9} = {D5A93398-AEB1-49F3-89DC-3904A47DB0C7}
{6410DA0F-5E14-4FC0-9AEE-F4C542C96C7A} = {172B608B-E6F3-41CC-9949-203A76BA247C}
{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{FE789F04-5E95-42C5-AEF1-E33F8DF06B3F} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{D18FCF91-8876-48A0-A693-2DC1E7D3D80A} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{D48EE8D0-0A0A-4493-AEF5-DAF5F8CF86AD} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{64CC4E44-CE3A-4319-BF3F-6CF8BD513870} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
Expand Down
2 changes: 1 addition & 1 deletion src/Android.Interop/Resources/Resource.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/Java.Interop.NamingCustomAttributes/Android.App/ActivityAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace Android.App
{
sealed partial class ActivityAttribute : Attribute {
public string Name {get; set;}
}
}
7 changes: 7 additions & 0 deletions src/Java.Interop.NamingCustomAttributes/Android.App/ApplicationAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using System;

namespace Android.App {
sealed partial class ApplicationAttribute : Attribute {
public string Name {get; set;}
}
}
8 changes: 8 additions & 0 deletions src/Java.Interop.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace Android.App {
sealed partial class InstrumentationAttribute : Attribute {
public string Name { get; set; }
}
}

7 changes: 7 additions & 0 deletions src/Java.Interop.NamingCustomAttributes/Android.App/ServiceAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
using System;

namespace Android.App {
sealed partial class ServiceAttribute : Attribute {
public string Name {get; set;}
}
}
8 changes: 8 additions & 0 deletions src/Java.Interop.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace Android.Content {

partial class BroadcastReceiverAttribute : Attribute {
public string Name { get; set; }
}
}
8 changes: 8 additions & 0 deletions src/Java.Interop.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;

namespace Android.Content {

partial class ContentProviderAttribute : Attribute {
public string Name { get; set; }
}
}
0 ...utes/Android.Runtime/RegisterAttribute.cs → ...utes/Android.Runtime/RegisterAttribute.cs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ....Android.NamingCustomAttributes.projitems → ....Interop.NamingCustomAttributes.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076}</SharedGUID>
<SharedGUID>{FE789F04-5E95-42C5-AEF1-E33F8DF06B3F}</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>Xamarin.Android.NamingCustomAttributes</Import_RootNamespace>
<Import_RootNamespace>Java.Interop.NamingCustomAttributes</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Android.Content\BroadcastReceiverAttribute.cs" />
Expand All @@ -21,4 +21,4 @@
<Compile Include="$(MSBuildThisFileDirectory)Android.App\ServiceAttribute.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Android.App\InstrumentationAttribute.cs" />
</ItemGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions ...rin.Android.NamingCustomAttributes.shproj → ...ava.Interop.NamingCustomAttributes.shproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<PropertyGroup>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{74598F5C-B8CC-4CE6-8EE2-AB9CA1400076}</ProjectGuid>
<ProjectGuid>{FE789F04-5E95-42C5-AEF1-E33F8DF06B3F}</ProjectGuid>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<Import Project="Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" />
<Import Project="Java.Interop.NamingCustomAttributes.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>
</Project>
0 ...ttributes/Java.Interop/ExportAttribute.cs → ...ttributes/Java.Interop/ExportAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...utes/Java.Interop/ExportFieldAttribute.cs → ...utes/Java.Interop/ExportFieldAttribute.cs
View file
Open in desktop
File renamed without changes.
0 .../Java.Interop/ExportParameterAttribute.cs → .../Java.Interop/ExportParameterAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...butes/Java.Interop/ExportParameterKind.cs → ...butes/Java.Interop/ExportParameterKind.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\JavaTypeScanner.cs" />
<Compile Include="Java.Interop.Tools.JavaCallableWrappers\TypeNameMapGenerator.cs" />
</ItemGroup>
<Import Project="..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
<Import Project="..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
<Import Project="..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" Label="Shared" Condition="Exists('..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems')" />
<ItemGroup>
<ProjectReference Include="..\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj">
Expand All @@ -74,4 +74,4 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions ...erop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@
<Folder Include="Java.Interop.Tools.JavaCallableWrappers\" />
</ItemGroup>
<Import Project="..\..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems" Label="Shared" Condition="Exists('..\..\Java.Interop.Tools.TypeNameMappings\Java.Interop.Tools.TypeNameMappings.projitems')" />
<Import Project="..\..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\..\Xamarin.Android.NamingCustomAttributes\Xamarin.Android.NamingCustomAttributes.projitems')" />
<Import Project="..\..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems" Label="Shared" Condition="Exists('..\..\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems')" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
</Project>
74 changes: 0 additions & 74 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/Xamarin.Android.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs
View file
Open in desktop

This file was deleted.

Loading