Skip to content

Commit 2e392e3

Browse files
jonpryorjonpryor
committed
[System.EnterpriseServices] Import from monodroid/84a3e6cb
System.EnterpriseServices.dll is an empty shell. It contains no types. It isn't *directly* used by *anything*. The entire reason it exists is so that Visual Studio (2010?)- generated Web Services would compile, as the generated project would contain an assembly reference to System.EnterpriseServices.dll, even though that assembly wasn't actually *used*. I suspect that this thread is relevant: http://lists.ximian.com/pipermail/monodroid/2010-October/001398.html > I had the same problem, I fixed it by removing the reference to > System.EnterpriseServices.dll. That assembly isn't in MonoDroid P5 > and it falls back to your GAC to find it which causes chaos later.
1 parent 10b5364 commit 2e392e3

File tree

3 files changed

+95
-0
lines changed

3 files changed

+95
-0
lines changed

‎Xamarin.Android.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Tests", "src\M
6565
EndProject
6666
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}"
6767
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices", "src\System.EnterpriseServices\System.EnterpriseServices.csproj", "{2868FC32-A4E7-4008-87C8-2C7879CACB58}"
69+
EndProject
6870
Global
6971
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7072
Debug|AnyCPU = Debug|AnyCPU
@@ -266,6 +268,18 @@ Global
266268
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
267269
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
268270
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
271+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
272+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.Build.0 = Debug|Any CPU
273+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.ActiveCfg = Release|Any CPU
274+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.Build.0 = Release|Any CPU
275+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
276+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
277+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU
278+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU
279+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU
280+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU
281+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU
282+
{2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU
269283
EndGlobalSection
270284
GlobalSection(NestedProjects) = preSolution
271285
{8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62}
@@ -296,6 +310,7 @@ Global
296310
{53E4ABF0-1085-45F9-B964-DCAE4B819998} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
297311
{40EAD437-216B-4DF4-8258-3F47E1672C3A} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483}
298312
{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
313+
{2868FC32-A4E7-4008-87C8-2C7879CACB58} = {04E3E11E-B47D-4599-8AFC-50515A95E715}
299314
EndGlobalSection
300315
GlobalSection(MonoDevelopProperties) = preSolution
301316
Policies = $0

‎src/System.EnterpriseServices/Properties/AssemblyInfo.cs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using System;
2+
using System.Reflection;
3+
using System.Runtime.CompilerServices;
4+
using System.Runtime.InteropServices;
5+
6+
// General Information about an assembly is controlled through the following
7+
// set of attributes. Change these attribute values to modify the information
8+
// associated with an assembly.
9+
[assembly: AssemblyTitle("System.EnterpriseServices")]
10+
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyConfiguration("")]
12+
[assembly: AssemblyCompany("")]
13+
[assembly: AssemblyProduct("")]
14+
[assembly: AssemblyCopyright("")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: AssemblyCulture("")]
17+
18+
// Setting ComVisible to false makes the types in this assembly not visible
19+
// to COM components. If you need to access a type in this assembly from
20+
// COM, set the ComVisible attribute to true on that type.
21+
[assembly: ComVisible(false)]
22+
23+
// Version information for an assembly consists of the following four values:
24+
//
25+
// Major Version
26+
// Minor Version
27+
// Build Number
28+
// Revision
29+
//
30+
// You can specify all the values or you can default the Revision and Build Numbers
31+
// by using the '*' as shown below:
32+
[assembly: AssemblyVersion("2.0.5")]
33+
[assembly: AssemblyFileVersion("2.0.5")]
34+
35+
#if SIGN_ASSEMBLY
36+
[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")]
37+
#endif

‎src/System.EnterpriseServices/System.EnterpriseServices.csproj

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProjectGuid>{2868FC32-A4E7-4008-87C8-2C7879CACB58}</ProjectGuid>
7+
<OutputType>Library</OutputType>
8+
<RootNamespace>System.EnterpriseServices</RootNamespace>
9+
<AssemblyName>System.EnterpriseServices</AssemblyName>
10+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11+
<SignAssembly>true</SignAssembly>
12+
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15+
<DebugSymbols>true</DebugSymbols>
16+
<DebugType>full</DebugType>
17+
<Optimize>false</Optimize>
18+
<OutputPath>..\..\bin\Debug\lib\xbuild-frameworks\MonoAndroid\v1.0</OutputPath>
19+
<DefineConstants>DEBUG;</DefineConstants>
20+
<ErrorReport>prompt</ErrorReport>
21+
<WarningLevel>4</WarningLevel>
22+
<ConsolePause>false</ConsolePause>
23+
<NoStdLib>true</NoStdLib>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26+
<Optimize>true</Optimize>
27+
<OutputPath>..\..\bin\Release\lib\xbuild-frameworks\MonoAndroid\v1.0</OutputPath>
28+
<ErrorReport>prompt</ErrorReport>
29+
<WarningLevel>4</WarningLevel>
30+
<ConsolePause>false</ConsolePause>
31+
<NoStdLib>true</NoStdLib>
32+
</PropertyGroup>
33+
<ItemGroup>
34+
<Reference Include="mscorlib">
35+
<HintPath>$(OutputPath)..\v1.0\mscorlib.dll</HintPath>
36+
<Private>False</Private>
37+
</Reference>
38+
</ItemGroup>
39+
<ItemGroup>
40+
<Compile Include="Properties\AssemblyInfo.cs" />
41+
</ItemGroup>
42+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
43+
</Project>

0 commit comments

Comments
 (0)