Skip to content

Commit 238f734

Browse files
afifi-insafifi-ins
committed
Update WCF Samples
1 parent 48eef59 commit 238f734

File tree

631 files changed

+4375
-17306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

631 files changed

+4375
-17306
lines changed

‎framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/App.config

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<!--Copyright (c) Microsoft Corporation. All Rights Reserved.-->
33
<configuration>
44
<appSettings>
55
<!-- use appSetting to configure MSMQ Dead Letter queue name -->
6-
<add key="deadLetterQueueName" value=".\private$\ServiceModelSamplesOrdersAppDLQ"/>
6+
<add key="deadLetterQueueName" value=".\private$\ServiceModelSamplesOrdersAppDLQ" />
77
</appSettings>
8-
98
<system.serviceModel>
109
<client>
1110
<!-- Define NetMsmqEndpoint -->
12-
<endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
11+
<endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
1312
</client>
14-
1513
<bindings>
1614
<netMsmqBinding>
1715
<binding name="PerAppDLQBinding" deadLetterQueue="Custom" customDeadLetterQueue="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ" timeToLive="00:00:02">
18-
<security mode="None"/>
16+
<security mode="None" />
1917
</binding>
2018
</netMsmqBinding>
2119
</bindings>
2220
</system.serviceModel>
23-
24-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
21+
</configuration>

‎framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/Client.csproj

+5-46
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
67
<ProductVersion>8.0.50727</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{5C7DFB5F-0CA6-41CC-ABD3-670459BDD569}</ProjectGuid>
99
<OutputType>Exe</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Client</RootNamespace>
1212
<AssemblyName>Client</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<FileUpgradeFlags>
15-
</FileUpgradeFlags>
16-
<OldToolsVersion>2.0</OldToolsVersion>
17-
<UpgradeBackupLocation />
13+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1814
<PublishUrl>publish\</PublishUrl>
19-
<Install>true</Install>
20-
<InstallFrom>Disk</InstallFrom>
21-
<UpdateEnabled>false</UpdateEnabled>
22-
<UpdateMode>Foreground</UpdateMode>
23-
<UpdateInterval>7</UpdateInterval>
24-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
25-
<UpdatePeriodically>false</UpdatePeriodically>
26-
<UpdateRequired>false</UpdateRequired>
27-
<MapFileExtensions>true</MapFileExtensions>
28-
<ApplicationRevision>0</ApplicationRevision>
29-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
30-
<IsWebBootstrapper>false</IsWebBootstrapper>
31-
<UseApplicationTrust>false</UseApplicationTrust>
32-
<BootstrapperEnabled>true</BootstrapperEnabled>
33-
<TargetFrameworkProfile />
3415
</PropertyGroup>
3516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3617
<DebugSymbols>true</DebugSymbols>
@@ -69,27 +50,5 @@
6950
<ItemGroup>
7051
<None Include="App.config" />
7152
</ItemGroup>
72-
<ItemGroup>
73-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
74-
<Visible>False</Visible>
75-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
76-
<Install>false</Install>
77-
</BootstrapperPackage>
78-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
79-
<Visible>False</Visible>
80-
<ProductName>.NET Framework 3.5 SP1</ProductName>
81-
<Install>true</Install>
82-
</BootstrapperPackage>
83-
<BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
84-
<Visible>False</Visible>
85-
<ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
86-
<Install>true</Install>
87-
</BootstrapperPackage>
88-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
89-
<Visible>False</Visible>
90-
<ProductName>Windows Installer 3.1</ProductName>
91-
<Install>true</Install>
92-
</BootstrapperPackage>
93-
</ItemGroup>
94-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
95-
</Project>
53+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54+
</Project>

‎framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/App.config

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<!--Copyright (c) Microsoft Corporation. All Rights Reserved.-->
33
<configuration>
44
<system.serviceModel>
55
<services>
66
<service name="Microsoft.Samples.MSMQDeadLetter.PurchaseOrderDLQService">
77
<!-- Define NetMsmqEndpoint in this case, DLQ end point to read messages-->
8-
<endpoint address="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ" binding="netMsmqBinding" bindingConfiguration="DefaultBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
8+
<endpoint address="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ" binding="netMsmqBinding" bindingConfiguration="DefaultBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
99
</service>
1010
</services>
11-
1211
<client>
1312
<!-- Define NetMsmqEndpoint -->
14-
<endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="SystemDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
13+
<endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="SystemDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
1514
</client>
16-
1715
<bindings>
1816
<netMsmqBinding>
1917
<binding name="DefaultBinding">
20-
<security mode="None"/>
21-
</binding>
22-
<binding name="SystemDLQBinding" deadLetterQueue="System">
18+
<security mode="None" />
2319
</binding>
20+
<binding name="SystemDLQBinding" deadLetterQueue="System"></binding>
2421
</netMsmqBinding>
2522
</bindings>
2623
</system.serviceModel>
27-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
24+
</configuration>

‎framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/DeadLetterService.csproj

+5-46
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
67
<ProductVersion>8.0.50727</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{530DCEDD-FBF5-43A7-80AC-BF0A78FFFB94}</ProjectGuid>
99
<OutputType>Exe</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>DeadLetterService</RootNamespace>
1212
<AssemblyName>DeadLetterService</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<FileUpgradeFlags>
15-
</FileUpgradeFlags>
16-
<OldToolsVersion>2.0</OldToolsVersion>
17-
<UpgradeBackupLocation />
13+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1814
<PublishUrl>publish\</PublishUrl>
19-
<Install>true</Install>
20-
<InstallFrom>Disk</InstallFrom>
21-
<UpdateEnabled>false</UpdateEnabled>
22-
<UpdateMode>Foreground</UpdateMode>
23-
<UpdateInterval>7</UpdateInterval>
24-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
25-
<UpdatePeriodically>false</UpdatePeriodically>
26-
<UpdateRequired>false</UpdateRequired>
27-
<MapFileExtensions>true</MapFileExtensions>
28-
<ApplicationRevision>0</ApplicationRevision>
29-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
30-
<IsWebBootstrapper>false</IsWebBootstrapper>
31-
<UseApplicationTrust>false</UseApplicationTrust>
32-
<BootstrapperEnabled>true</BootstrapperEnabled>
33-
<TargetFrameworkProfile />
3415
</PropertyGroup>
3516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3617
<DebugSymbols>true</DebugSymbols>
@@ -69,27 +50,5 @@
6950
<ItemGroup>
7051
<None Include="App.config" />
7152
</ItemGroup>
72-
<ItemGroup>
73-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
74-
<Visible>False</Visible>
75-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
76-
<Install>false</Install>
77-
</BootstrapperPackage>
78-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
79-
<Visible>False</Visible>
80-
<ProductName>.NET Framework 3.5 SP1</ProductName>
81-
<Install>true</Install>
82-
</BootstrapperPackage>
83-
<BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
84-
<Visible>False</Visible>
85-
<ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
86-
<Install>true</Install>
87-
</BootstrapperPackage>
88-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
89-
<Visible>False</Visible>
90-
<ProductName>Windows Installer 3.1</ProductName>
91-
<Install>true</Install>
92-
</BootstrapperPackage>
93-
</ItemGroup>
94-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
95-
</Project>
53+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54+
</Project>

‎framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/App.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<!--Copyright (c) Microsoft Corporation. All Rights Reserved.-->
33
<configuration>
44
<appSettings>
55
<!-- use appSetting to configure MSMQ dead letter queue -->
6-
<add key="queueName" value=".\private$\ServiceModelSamplesDeadLetter"/>
6+
<add key="queueName" value=".\private$\ServiceModelSamplesDeadLetter" />
77
</appSettings>
88
<system.serviceModel>
99
<services>
1010
<service name="Microsoft.Samples.MSMQDeadLetter.OrderProcessorService">
1111
<host>
1212
<baseAddresses>
13-
<add baseAddress="http://localhost:8000/orderProcessor/deadLetterSample"/>
13+
<add baseAddress="http://localhost:8000/orderProcessor/deadLetterSample" />
1414
</baseAddresses>
1515
</host>
1616
<!-- Define NetMsmqEndpoint -->
17-
<endpoint address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
17+
<endpoint address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
1818
</service>
1919
</services>
2020
<bindings>
2121
<netMsmqBinding>
2222
<binding name="PerAppDLQBinding" deadLetterQueue="Custom" customDeadLetterQueue="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ">
23-
<security mode ="None"/>
23+
<security mode="None" />
2424
</binding>
2525
</netMsmqBinding>
2626
</bindings>
2727
</system.serviceModel>
28-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
28+
</configuration>

‎framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/Service.csproj

+5-46
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
67
<ProductVersion>8.0.50727</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{60FECAE3-DA07-43E1-B64B-630C1CD87FC5}</ProjectGuid>
99
<OutputType>Exe</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Service</RootNamespace>
1212
<AssemblyName>Service</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<FileUpgradeFlags>
15-
</FileUpgradeFlags>
16-
<OldToolsVersion>2.0</OldToolsVersion>
17-
<UpgradeBackupLocation />
13+
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
1814
<PublishUrl>publish\</PublishUrl>
19-
<Install>true</Install>
20-
<InstallFrom>Disk</InstallFrom>
21-
<UpdateEnabled>false</UpdateEnabled>
22-
<UpdateMode>Foreground</UpdateMode>
23-
<UpdateInterval>7</UpdateInterval>
24-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
25-
<UpdatePeriodically>false</UpdatePeriodically>
26-
<UpdateRequired>false</UpdateRequired>
27-
<MapFileExtensions>true</MapFileExtensions>
28-
<ApplicationRevision>0</ApplicationRevision>
29-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
30-
<IsWebBootstrapper>false</IsWebBootstrapper>
31-
<UseApplicationTrust>false</UseApplicationTrust>
32-
<BootstrapperEnabled>true</BootstrapperEnabled>
33-
<TargetFrameworkProfile />
3415
</PropertyGroup>
3516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3617
<DebugSymbols>true</DebugSymbols>
@@ -68,27 +49,5 @@
6849
<ItemGroup>
6950
<None Include="App.config" />
7051
</ItemGroup>
71-
<ItemGroup>
72-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
73-
<Visible>False</Visible>
74-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
75-
<Install>false</Install>
76-
</BootstrapperPackage>
77-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
78-
<Visible>False</Visible>
79-
<ProductName>.NET Framework 3.5 SP1</ProductName>
80-
<Install>true</Install>
81-
</BootstrapperPackage>
82-
<BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
83-
<Visible>False</Visible>
84-
<ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
85-
<Install>true</Install>
86-
</BootstrapperPackage>
87-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
88-
<Visible>False</Visible>
89-
<ProductName>Windows Installer 3.1</ProductName>
90-
<Install>true</Install>
91-
</BootstrapperPackage>
92-
</ItemGroup>
93-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
94-
</Project>
52+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
53+
</Project>

‎framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/App.config

+13-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<!--Copyright (c) Microsoft Corporation. All rights reserved.-->
33
<configuration>
4-
54
<system.serviceModel>
6-
75
<client>
86
<!-- Define NetMsmqEndpoint -->
9-
<endpoint address="net.msmq://localhost/private/ServiceModelSamplesMessageSecurity" binding="netMsmqBinding" bindingConfiguration="messageSecurityBinding" contract="Microsoft.Samples.MSMQMessageSecurity.IOrderProcessor" behaviorConfiguration="ClientCertificateBehavior"/>
7+
<endpoint address="net.msmq://localhost/private/ServiceModelSamplesMessageSecurity" binding="netMsmqBinding" bindingConfiguration="messageSecurityBinding" contract="Microsoft.Samples.MSMQMessageSecurity.IOrderProcessor" behaviorConfiguration="ClientCertificateBehavior" />
108
</client>
11-
129
<bindings>
13-
<netMsmqBinding>
14-
<binding name="messageSecurityBinding">
15-
<security mode="Message">
16-
<message clientCredentialType="Certificate"/>
17-
</security>
18-
</binding>
19-
</netMsmqBinding>
10+
<netMsmqBinding>
11+
<binding name="messageSecurityBinding">
12+
<security mode="Message">
13+
<message clientCredentialType="Certificate" />
14+
</security>
15+
</binding>
16+
</netMsmqBinding>
2017
</bindings>
21-
2218
<behaviors>
2319
<endpointBehaviors>
2420
<behavior name="ClientCertificateBehavior">
@@ -28,9 +24,9 @@
2824
This configuration references the "client.com" certificate installed during the setup instructions.
2925
-->
3026
<clientCredentials>
31-
<clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName"/>
27+
<clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName" />
3228
<serviceCertificate>
33-
<defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName"/>
29+
<defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" />
3430
<!--
3531
Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate
3632
is in the user's Trusted People store, then it will be trusted without performing a
@@ -39,12 +35,11 @@
3935
This setting is less secure than the default, ChainTrust. The security implications of this
4036
setting should be carefully considered before using PeerOrChainTrust in production code.
4137
-->
42-
<authentication certificateValidationMode="PeerOrChainTrust"/>
38+
<authentication certificateValidationMode="PeerOrChainTrust" />
4339
</serviceCertificate>
4440
</clientCredentials>
4541
</behavior>
4642
</endpointBehaviors>
4743
</behaviors>
48-
4944
</system.serviceModel>
50-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
45+
</configuration>

0 commit comments

Comments
 (0)