From 2e392e32e4384fc189e9cfb7c2fdb83243f28bd4 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 1 Jun 2016 17:21:33 -0400 Subject: [PATCH] [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. --- Xamarin.Android.sln | 15 +++++++ .../Properties/AssemblyInfo.cs | 37 ++++++++++++++++ .../System.EnterpriseServices.csproj | 43 +++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 src/System.EnterpriseServices/Properties/AssemblyInfo.cs create mode 100644 src/System.EnterpriseServices/System.EnterpriseServices.csproj diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index 6c4ee86d068..3dd06009343 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -65,6 +65,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Android-Tests", "src\M EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Posix", "src\Mono.Posix\Mono.Posix.csproj", "{83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices", "src\System.EnterpriseServices\System.EnterpriseServices.csproj", "{2868FC32-A4E7-4008-87C8-2C7879CACB58}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|AnyCPU = Debug|AnyCPU @@ -266,6 +268,18 @@ Global {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.Build.0 = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.Build.0 = Release|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|Any CPU.ActiveCfg = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|Any CPU.Build.0 = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} @@ -296,6 +310,7 @@ Global {53E4ABF0-1085-45F9-B964-DCAE4B819998} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} {40EAD437-216B-4DF4-8258-3F47E1672C3A} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} {83F00D30-0AC6-40D8-834B-DD39B6CAA8B3} = {04E3E11E-B47D-4599-8AFC-50515A95E715} + {2868FC32-A4E7-4008-87C8-2C7879CACB58} = {04E3E11E-B47D-4599-8AFC-50515A95E715} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/src/System.EnterpriseServices/Properties/AssemblyInfo.cs b/src/System.EnterpriseServices/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..3203794e679 --- /dev/null +++ b/src/System.EnterpriseServices/Properties/AssemblyInfo.cs @@ -0,0 +1,37 @@ +using System; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("System.EnterpriseServices")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("2.0.5")] +[assembly: AssemblyFileVersion("2.0.5")] + +#if SIGN_ASSEMBLY +[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")] +#endif diff --git a/src/System.EnterpriseServices/System.EnterpriseServices.csproj b/src/System.EnterpriseServices/System.EnterpriseServices.csproj new file mode 100644 index 00000000000..212d46fe1d3 --- /dev/null +++ b/src/System.EnterpriseServices/System.EnterpriseServices.csproj @@ -0,0 +1,43 @@ + + + + Debug + AnyCPU + {2868FC32-A4E7-4008-87C8-2C7879CACB58} + Library + System.EnterpriseServices + System.EnterpriseServices + v4.5 + true + ..\..\product.snk + + + true + full + false + ..\..\bin\Debug\lib\xbuild-frameworks\MonoAndroid\v1.0 + DEBUG; + prompt + 4 + false + true + + + true + ..\..\bin\Release\lib\xbuild-frameworks\MonoAndroid\v1.0 + prompt + 4 + false + true + + + + $(OutputPath)..\v1.0\mscorlib.dll + False + + + + + + + \ No newline at end of file