X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.ServiceModel%2FSystem.ServiceModel-net_4_x.csproj;h=b54ee17594caf755ee9b18fbdb429247b377ee4a;hb=86c24e94279f56d0426924fbb533f14d2c9b41a0;hp=ef3d1d30350fec2fc372e3f66ef9bef6aee758e9;hpb=f9596050629ebf0d8d24fb256cc08f98d6d2c7e7;p=mono.git

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj
index ef3d1d30350..b54ee17594c 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj
+++ b/mcs/class/System.ServiceModel/System.ServiceModel-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>
     <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>
     <OutputPath>./../../class/lib/net_4_x</OutputPath>
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
     <NoStdLib>True</NoStdLib>
+    
     <NoConfig>True</NoConfig>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -25,7 +28,7 @@
     <DebugType>full</DebugType>
     <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>
     <Optimize>false</Optimize>
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -33,7 +36,7 @@
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699,414,169,67,3005,436,219,618</NoWarn>
     <Optimize>true</Optimize>
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;TRACE;NET_3_0;HAS_ACTIVATION</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -824,14 +827,12 @@
     <Compile Include="System.ServiceModel.PeerResolvers\UnregisterInfo.cs" />
     <Compile Include="System.ServiceModel.PeerResolvers\UpdateInfo.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\AuthenticatorCommunicationObject.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\BinarySecretSecurityToken.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\ClaimTypeRequirement.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenAuthenticator.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\CommunicationSecurityTokenProvider.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\DerivedKeySecurityToken.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\IIssuanceSecurityTokenAuthenticator.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\InitiatorServiceModelSecurityTokenRequirement.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\InternalEncryptedKeyIdentifierClause.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\ISecurityContextSecurityTokenCache.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenHandler.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\IssuedSecurityTokenParameters.cs" />
@@ -865,10 +866,8 @@
     <Compile Include="System.ServiceModel.Security.Tokens\TlsClientSession.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\TlsServerSession.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\UserNameSecurityTokenParameters.cs" />
-    <Compile Include="System.ServiceModel.Security.Tokens\WrappedKeySecurityToken.cs" />
     <Compile Include="System.ServiceModel.Security.Tokens\X509SecurityTokenParameters.cs" />
     <Compile Include="System.ServiceModel.Security\BasicSecurityProfileVersion.cs" />
-    <Compile Include="System.ServiceModel.Security\BinarySecretKeyIdentifierClause.cs" />
     <Compile Include="System.ServiceModel.Security\ChannelProtectionRequirements.cs" />
     <Compile Include="System.ServiceModel.Security\DataProtectionSecurityStateEncoder.cs" />
     <Compile Include="System.ServiceModel.Security\ExpiredSecurityTokenException.cs" />
@@ -881,7 +880,6 @@
     <Compile Include="System.ServiceModel.Security\IssuedTokenClientCredential.cs" />
     <Compile Include="System.ServiceModel.Security\IssuedTokenServiceCredential.cs" />
     <Compile Include="System.ServiceModel.Security\KeyEntropyMode.cs" />
-    <Compile Include="System.ServiceModel.Security\KeyNameIdentifierClause.cs" />
     <Compile Include="System.ServiceModel.Security\MessagePartSpecification.cs" />
     <Compile Include="System.ServiceModel.Security\MessageProtectionOrder.cs" />
     <Compile Include="System.ServiceModel.Security\MessageSecurityException.cs" />
@@ -891,7 +889,6 @@
     <Compile Include="System.ServiceModel.Security\SecureConversationVersion.cs" />
     <Compile Include="System.ServiceModel.Security\SecurityAccessDeniedException.cs" />
     <Compile Include="System.ServiceModel.Security\SecurityAlgorithmSuite.cs" />
-    <Compile Include="System.ServiceModel.Security\SecurityContextKeyIdentifierClause.cs" />
     <Compile Include="System.ServiceModel.Security\SecurityCredentialsManager.cs" />
     <Compile Include="System.ServiceModel.Security\SecurityMessageProperty.cs" />
     <Compile Include="System.ServiceModel.Security\SecurityNegotiationException.cs" />
@@ -999,6 +996,7 @@
     <Compile Include="System.ServiceModel\NamedPipeTransportSecurity.cs" />
     <Compile Include="System.ServiceModel\NetHttpBinding.cs" />
     <Compile Include="System.ServiceModel\NetHttpMessageEncoding.cs" />
+    <Compile Include="System.ServiceModel\NetHttpsBinding.cs" />
     <Compile Include="System.ServiceModel\NetMsmqBinding.cs" />
     <Compile Include="System.ServiceModel\NetMsmqSecurity.cs" />
     <Compile Include="System.ServiceModel\NetNamedPipeBinding.cs" />
@@ -1065,15 +1063,14 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
     </PreBuildEvent>
-
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 
@@ -1084,10 +1081,6 @@
       <Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
       <Name>corlib-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj">
-      <Project>{7A23227C-591B-4F80-9D62-4D0271073D82}</Project>
-      <Name>System.ServiceModel.Activation-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System/System-net_4_x.csproj">
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
       <Name>System-net_4_x</Name>
@@ -1104,6 +1097,10 @@
       <Project>{D845AD9D-3CCB-49CB-9543-028678E94938}</Project>
       <Name>System.Runtime.Serialization-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_x.csproj">
+      <Project>{FA718FA9-32C2-4BAC-BAAB-DB3A7A326D4C}</Project>
+      <Name>System.IdentityModel-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_x.csproj">
       <Project>{D5CDC09C-F19A-4811-A6C8-70F51CBFB644}</Project>
       <Name>System.Configuration-net_4_x</Name>
@@ -1116,10 +1113,6 @@
       <Project>{3ED36717-A9D1-4289-8949-9B7F39766DEB}</Project>
       <Name>System.Security-net_4_x</Name>
     </ProjectReference>
-    <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_x.csproj">
-      <Project>{FA718FA9-32C2-4BAC-BAAB-DB3A7A326D4C}</Project>
-      <Name>System.IdentityModel-net_4_x</Name>
-    </ProjectReference>
     <ProjectReference Include="../System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_x.csproj">
       <Project>{BBA32980-B28C-476D-AEB0-892F1B1DFB5E}</Project>
       <Name>System.IdentityModel.Selectors-net_4_x</Name>
@@ -1144,6 +1137,10 @@
       <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>
       <Name>System.Web-net_4_x</Name>
     </ProjectReference>
+    <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_x.csproj">
+      <Project>{7A23227C-591B-4F80-9D62-4D0271073D82}</Project>
+      <Name>System.ServiceModel.Activation-net_4_x</Name>
+    </ProjectReference>
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_x.csproj">
       <Project>{928432BE-3518-4103-97F6-48B9658588A6}</Project>
       <Name>System.Web.ApplicationServices-net_4_x</Name>