projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 280f222)
[msvc] Update csproj files (#4813)
authormonojenkins <jo.shields+jenkins@xamarin.com>
Tue, 9 May 2017 16:58:10 +0000 (18:58 +0200)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 9 May 2017 16:58:10 +0000 (18:58 +0200)
mcs/class/System/System-bare-net_4_x.csproj patch | blob | history
mcs/class/System/System-net_4_x.csproj patch | blob | history
mcs/class/System/System-secxml-net_4_x.csproj patch | blob | history
mcs/tools/resx2sr/resx2sr-net_4_x.csproj [new file with mode: 0644] patch | blob
msvc/scripts/order.xml patch | blob | history
net_4_x.sln patch | blob | history

diff --git a/mcs/class/System/System-bare-net_4_x.csproj b/mcs/class/System/System-bare-net_4_x.csproj
index 2be29d14ae84014e4474c81ded85f55916a635c7..e702e9f45d36f31f374377930598da065765b18d 100644 (file)
--- a/mcs/class/System/System-bare-net_4_x.csproj
+++ b/mcs/class/System/System-bare-net_4_x.csproj
@@ -1181,7 +1181,6 @@
     <Compile Include="System.Net\BasicClient.cs" />\r
     <Compile Include="System.Net\BindIPEndPoint.cs" />\r
     <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\MonoChunkStream.cs" />\r
     <Compile Include="System.Net\DecompressionMethods.cs" />\r
     <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
     <Compile Include="System.Net\DigestClient.cs" />\r
@@ -1200,6 +1199,7 @@
     <Compile Include="System.Net\FtpWebResponse.cs" />\r
     <Compile Include="System.Net\HttpConnection.cs" />\r
     <Compile Include="System.Net\HttpListener.cs" />\r
+    <Compile Include="System.Net\HttpListener.Mono.cs" />\r
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
     <Compile Include="System.Net\HttpListenerContext.cs" />\r
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
@@ -1218,6 +1218,7 @@
     <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
     <Compile Include="System.Net\ListenerPrefix.cs" />\r
     <Compile Include="System.Net\MacProxy.cs" />\r
+    <Compile Include="System.Net\MonoChunkStream.cs" />\r
     <Compile Include="System.Net\MonoHttpDate.cs" />\r
     <Compile Include="System.Net\NetConfig.cs" />\r
     <Compile Include="System.Net\NtlmClient.cs" />\r
diff --git a/mcs/class/System/System-net_4_x.csproj b/mcs/class/System/System-net_4_x.csproj
index 21b0280379acc7d5885183feb52390f85fb4bb3a..66e20e24fa0f5a614eaf933fd0c329dfafdbb76a 100644 (file)
--- a/mcs/class/System/System-net_4_x.csproj
+++ b/mcs/class/System/System-net_4_x.csproj
@@ -1181,7 +1181,6 @@
     <Compile Include="System.Net\BasicClient.cs" />\r
     <Compile Include="System.Net\BindIPEndPoint.cs" />\r
     <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\MonoChunkStream.cs" />\r
     <Compile Include="System.Net\DecompressionMethods.cs" />\r
     <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
     <Compile Include="System.Net\DigestClient.cs" />\r
@@ -1200,6 +1199,7 @@
     <Compile Include="System.Net\FtpWebResponse.cs" />\r
     <Compile Include="System.Net\HttpConnection.cs" />\r
     <Compile Include="System.Net\HttpListener.cs" />\r
+    <Compile Include="System.Net\HttpListener.Mono.cs" />\r
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
     <Compile Include="System.Net\HttpListenerContext.cs" />\r
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
@@ -1218,6 +1218,7 @@
     <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
     <Compile Include="System.Net\ListenerPrefix.cs" />\r
     <Compile Include="System.Net\MacProxy.cs" />\r
+    <Compile Include="System.Net\MonoChunkStream.cs" />\r
     <Compile Include="System.Net\MonoHttpDate.cs" />\r
     <Compile Include="System.Net\NetConfig.cs" />\r
     <Compile Include="System.Net\NtlmClient.cs" />\r
diff --git a/mcs/class/System/System-secxml-net_4_x.csproj b/mcs/class/System/System-secxml-net_4_x.csproj
index 3b1d36f6f39327d60dac173580f133dc0b440625..b8c05e9c76586c125a047d6cb4948cce37f2c1f4 100644 (file)
--- a/mcs/class/System/System-secxml-net_4_x.csproj
+++ b/mcs/class/System/System-secxml-net_4_x.csproj
@@ -1181,7 +1181,6 @@
     <Compile Include="System.Net\BasicClient.cs" />\r
     <Compile Include="System.Net\BindIPEndPoint.cs" />\r
     <Compile Include="System.Net\ChunkedInputStream.cs" />\r
-    <Compile Include="System.Net\MonoChunkStream.cs" />\r
     <Compile Include="System.Net\DecompressionMethods.cs" />\r
     <Compile Include="System.Net\DefaultCertificatePolicy.cs" />\r
     <Compile Include="System.Net\DigestClient.cs" />\r
@@ -1200,6 +1199,7 @@
     <Compile Include="System.Net\FtpWebResponse.cs" />\r
     <Compile Include="System.Net\HttpConnection.cs" />\r
     <Compile Include="System.Net\HttpListener.cs" />\r
+    <Compile Include="System.Net\HttpListener.Mono.cs" />\r
     <Compile Include="System.Net\HttpListenerBasicIdentity.cs" />\r
     <Compile Include="System.Net\HttpListenerContext.cs" />\r
     <Compile Include="System.Net\HttpListenerPrefixCollection.cs" />\r
@@ -1218,6 +1218,7 @@
     <Compile Include="System.Net\ListenerAsyncResult.cs" />\r
     <Compile Include="System.Net\ListenerPrefix.cs" />\r
     <Compile Include="System.Net\MacProxy.cs" />\r
+    <Compile Include="System.Net\MonoChunkStream.cs" />\r
     <Compile Include="System.Net\MonoHttpDate.cs" />\r
     <Compile Include="System.Net\NetConfig.cs" />\r
     <Compile Include="System.Net\NtlmClient.cs" />\r
diff --git a/mcs/tools/resx2sr/resx2sr-net_4_x.csproj b/mcs/tools/resx2sr/resx2sr-net_4_x.csproj
new file mode 100644 (file)
index 0000000..fa3f9db
--- /dev/null
+++ b/mcs/tools/resx2sr/resx2sr-net_4_x.csproj
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>9.0.30729</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{07D30676-A919-4763-8C3C-B2C4DAFFC662}</ProjectGuid>\r
+    <OutputType>Exe</OutputType>\r
+    <NoWarn>1699</NoWarn>\r
+    <OutputPath>./../../class/lib/net_4_x</OutputPath>\r
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>\r
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>\r
+    <NoStdLib>True</NoStdLib>\r
+    \r
+    <NoConfig>True</NoConfig>\r
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>\r
+    </RootNamespace>\r
+    <AssemblyName>resx2sr</AssemblyName>\r
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
+    <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+  \r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <NoWarn>1699</NoWarn>\r
+    <Optimize>false</Optimize>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <NoWarn>1699</NoWarn>\r
+    <Optimize>true</Optimize>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+  </PropertyGroup>\r
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
+  is a problem to compile the Mono mscorlib.dll -->\r
+  <PropertyGroup>\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
+  </PropertyGroup>\r
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+  <ItemGroup>\r
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />\r
+    <Compile Include="..\..\class\Mono.Options\Mono.Options\Options.cs" />\r
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapFormatter.cs" />\r
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapReader.cs" />\r
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapTypeMapper.cs" />\r
+    <Compile Include="..\..\class\System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap\SoapWriter.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\AssemblyNamesTypeResolutionService.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ByteArrayFromResXHandler.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\FileRefHandler.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\InMemoryHandler.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\NullRefHandler.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXDataNode.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXDataNodeHandler.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXFileRef.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXNullRef.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXResourceReader.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXResourceSet.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\ResXResourceWriter.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\SerializedFromResXHandler.cs" />\r
+    <Compile Include="..\..\class\System.Windows.Forms\System.Resources\TypeConverterFromResXHandler.cs" />\r
+    <Compile Include="resx2sr.cs" />\r  </ItemGroup>\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+  <PropertyGroup>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <ProjectReference Include="../../class/corlib/corlib-net_4_x.csproj">\r
+      <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>\r
+      <Name>corlib-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../../class/System/System-net_4_x.csproj">\r
+      <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
+      <Name>System-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../../class/System.Drawing/System.Drawing-net_4_x.csproj">\r
+      <Project>{584A5E46-2958-4CB2-8DF9-188B420D0BB0}</Project>\r
+      <Name>System.Drawing-net_4_x</Name>\r
+    </ProjectReference>\r
+    <ProjectReference Include="../../class/System.XML/System.Xml-net_4_x.csproj">\r
+      <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>\r
+      <Name>System.Xml-net_4_x</Name>\r
+    </ProjectReference>\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="Properties\" />\r
+  </ItemGroup>\r
+</Project>\r
+
diff --git a/msvc/scripts/order.xml b/msvc/scripts/order.xml
index 014c9b17b54210e48d00e9ff12076d2e3e3884a2..be784b6c9cfd5769c98faf8a14517d7e9b21c7c9 100644 (file)
--- a/msvc/scripts/order.xml
+++ b/msvc/scripts/order.xml
@@ -1067,6 +1067,17 @@
       <resources></resources>
       <response>commoncryptogenerator.exe.sources</response>
     </project>
+    <project dir="tools/resx2sr" library="resx2sr-build">
+      <boot></boot>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -unsafe -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../../class/lib/build/mscorlib.dll -optimize -r:System -r:System.Drawing -r:System.Xml</flags>
+      <output>resx2sr.exe</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/build/resx2sr.exe</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>build</profile>
+      <resources></resources>
+      <response>resx2sr.exe.sources</response>
+    </project>
     <project dir="ilasm" library="ilasm-build">
       <boot></boot>
       <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib -r:./../class/lib/build/mscorlib.dll -optimize -r:PEAPI -r:Mono.CompilerServices.SymbolWriter -r:Mono.Security</flags>
@@ -5170,6 +5181,17 @@
       <resources></resources>
       <response>commoncryptogenerator.exe.sources</response>
     </project>
+    <project dir="tools/resx2sr" library="resx2sr-net_4_x">
+      <boot></boot>
+      <flags>/codepage:65001 /nologo /noconfig /deterministic -unsafe -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -r:System -r:System.Drawing -r:System.Xml</flags>
+      <output>resx2sr.exe</output>
+      <built_sources></built_sources>
+      <library_output>./../../class/lib/net_4_x/resx2sr.exe</library_output>
+      <fx_version>4.5</fx_version>
+      <profile>net_4_x</profile>
+      <resources></resources>
+      <response>resx2sr.exe.sources</response>
+    </project>
     <project dir="tools/al" library="al-net_4_x">
       <boot></boot>
       <flags>/codepage:65001 /nologo /noconfig /deterministic -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib -r:./../../class/lib/net_4_x/mscorlib.dll /debug:portable -optimize -r:System -r:System.Core -r:Mono.Security -r:System.Security -r:Mono.CompilerServices.SymbolWriter</flags>
diff --git a/net_4_x.sln b/net_4_x.sln
index 56301bc8250a8127daf20b0c2dbd5ebdd0df13fa..9122ba00a96db0f1f351eef841acc39c1c8de562 100644 (file)
--- a/net_4_x.sln
+++ b/net_4_x.sln
@@ -589,6 +589,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cil-stringreplacer-net_4_x"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "commoncryptogenerator-net_4_x", "mcs/tools/commoncryptogenerator/commoncryptogenerator-net_4_x.csproj", "{12527E95-60D3-4A66-91C6-7F8031519299}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resx2sr-net_4_x", "mcs/tools/resx2sr/resx2sr-net_4_x.csproj", "{07D30676-A919-4763-8C3C-B2C4DAFFC662}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "al-net_4_x", "mcs/tools/al/al-net_4_x.csproj", "{D237CE6E-EA8F-4E8E-8413-295B27714AC6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "monolinker-net_4_x", "mcs/tools/linker/monolinker-net_4_x.csproj", "{FA920637-C202-4E75-AC0F-1A8DBD631DF1}"
@@ -1859,6 +1861,10 @@ Global
                {12527E95-60D3-4A66-91C6-7F8031519299}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {12527E95-60D3-4A66-91C6-7F8031519299}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {12527E95-60D3-4A66-91C6-7F8031519299}.Release|Any CPU.Build.0 = Release|Any CPU
+               {07D30676-A919-4763-8C3C-B2C4DAFFC662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {07D30676-A919-4763-8C3C-B2C4DAFFC662}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {07D30676-A919-4763-8C3C-B2C4DAFFC662}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {07D30676-A919-4763-8C3C-B2C4DAFFC662}.Release|Any CPU.Build.0 = Release|Any CPU
                {D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {D237CE6E-EA8F-4E8E-8413-295B27714AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
my mono mirror. check out Moved to http://github.com/mono/mono