Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2cdbac4
other xml issue in wcf/samples
cloudn9 Apr 20, 2020
1874444
trailing spaces
cloudn9 Apr 20, 2020
a9238ab
trailing spaces catch me once again
cloudn9 Apr 20, 2020
0887421
wpf part 1
cloudn9 Apr 21, 2020
17a1531
wpf part 2
cloudn9 Apr 21, 2020
8fd4bb0
Update docs/framework/wpf/advanced/colorconvertedbitmap-markup-extens…
cloudn9 Apr 23, 2020
44ebe5a
Update docs/framework/wpf/advanced/componentresourcekey-markup-extens…
cloudn9 Apr 23, 2020
430c5e4
Undo changes with ...
cloudn9 Apr 23, 2020
777079d
Update docs/framework/wpf/advanced/relativesource-markupextension.md
cloudn9 Apr 23, 2020
aa3c705
Update docs/framework/wpf/advanced/relativesource-markupextension.md
cloudn9 Apr 23, 2020
0632ca9
Undo changes with ...
cloudn9 Apr 23, 2020
6f14434
trailing spaces
cloudn9 Apr 23, 2020
d90175b
Update docs/framework/wpf/advanced/themedictionary-markup-extension.md
cloudn9 Apr 23, 2020
93cbd3f
Update docs/framework/wpf/advanced/dynamicresource-markup-extension.md
cloudn9 Apr 23, 2020
5344265
Update docs/framework/wpf/advanced/dynamicresource-markup-extension.md
cloudn9 Apr 23, 2020
d309a3d
Update docs/framework/wpf/advanced/dynamicresource-markup-extension.md
cloudn9 Apr 23, 2020
f33766b
Update docs/framework/wpf/advanced/propertypath-xaml-syntax.md
cloudn9 Apr 23, 2020
807a91d
Undo changes with ...
cloudn9 Apr 23, 2020
5a1eb29
undo changes with ...
cloudn9 Apr 23, 2020
958364b
Update docs/framework/wpf/advanced/staticresource-markup-extension.md
cloudn9 Apr 23, 2020
a474336
Update componentresourcekey-markup-extension.md
gewarren Apr 24, 2020
9040629
Update packaging-fonts-with-applications.md
gewarren Apr 24, 2020
40bbeaf
Update propertypath-xaml-syntax.md
gewarren Apr 24, 2020
bb99cf2
Update staticresource-markup-extension.md
gewarren Apr 24, 2020
4da0eba
Update templatebinding-markup-extension.md
gewarren Apr 24, 2020
146525b
Update templatebinding-markup-extension.md
gewarren Apr 24, 2020
63cb59a
Update themedictionary-markup-extension.md
gewarren Apr 24, 2020
c2c1a1f
Update wpf-windows-overview.md
gewarren Apr 24, 2020
d566ca1
Update wpf-application-resource-content-and-data-files.md
gewarren Apr 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/framework/wcf/samples/custom-service-host.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public class SelfDescribingServiceHostFactory : ServiceHostFactory
To use a custom factory with a service implementation, we must add some additional metadata to the service’s .svc file.

```xml
<%@ServiceHost Service="Microsoft.ServiceModel.Samples.CalculatorService"
<% @ServiceHost Service="Microsoft.ServiceModel.Samples.CalculatorService"
Factory="Microsoft.ServiceModel.Samples.SelfDescribingServiceHostFactory"
language=c# Debug="true" %>
```
Expand Down
2 changes: 1 addition & 1 deletion docs/framework/wcf/samples/discovery-security-sample.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The Discovery specification does not require that endpoints that participate in
The secure channel listener creates input or duplex channels that verify the compact signature in received messages. To verify the signature, the `KeyId` specified in the compact signature attached to the message is used to select a certificate from the specified store. If the message does not have a signature or the signature check fails, the messages are dropped. To use the secure binding, the sample defines a factory that creates custom <xref:System.ServiceModel.Discovery.UdpDiscoveryEndpoint> and <xref:System.ServiceModel.Discovery.UdpAnnouncementEndpoint> with the added discovery secure binding element. These secure endpoints can be used in discovery announcement listeners and discoverable services.

## Sample Details
The sample includes a library and 4 console applications:
The sample includes a library and 4 console applications:

- **DiscoverySecurityChannels**: A library that exposes the secure binding. The library computes and verifies the compact signature for outgoing/incoming messages.

Expand Down
1 change: 1 addition & 0 deletions docs/framework/wcf/samples/durable-instance-context.md
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ Client applications must add the DurableInstanceContextChannel into the channel
type="Microsoft.ServiceModel.Samples.DurableInstanceContextBindingElementSection, DurableInstanceContextExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
</bindingElementExtensions>
</extensions>
</system.serviceModel>
```

Now the binding element can be used with a custom binding just like other standard binding elements:
Expand Down
4 changes: 2 additions & 2 deletions docs/framework/wcf/samples/extending-tracing.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ This sample demonstrates how to extend the Windows Communication Foundation (WCF
</add>
</sharedListeners>
<trace autoflush="true" />
</system.diagnostics>....
....
</system.diagnostics>
....
```

### Correlating Activities
Expand Down
5 changes: 3 additions & 2 deletions docs/framework/wcf/samples/security-validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ public void Validate(ServiceDescription serviceDescription,
<behaviorExtensions>
<add name="endpointValidate" type="Microsoft.ServiceModel.Samples.EndpointValidateElement, endpointValidate, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
</behaviorExtensions>
</extensions>
...
</extensions>
...
</system.serviceModel>
```

Once the behavior extension is added to the service, it is now possible to add the `endpointValidate` behavior to the list of behaviors in the Web.config file and thus, to the service.
Expand Down
2 changes: 1 addition & 1 deletion docs/framework/wcf/samples/sessions-and-queues.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public static void Main()
</service>
</services>
...
<system.serviceModel>
</system.serviceModel>
```

The client creates a transaction scope. All messages in the session are sent to the queue within the transaction scope, causing it to be treated as an atomic unit where all messages succeed or fail. The transaction is committed by calling <xref:System.Transactions.TransactionScope.Complete%2A>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ WebServiceHost host = new WebServiceHost(typeof(ProcessService), new Uri("http:/
Alternatively, you can use <xref:System.ServiceModel.Activation.WebServiceHostFactory> from within an IIS-hosted .svc file to provide equivalent functionality (this technique is not demonstrated in this sample code).

```xml
<%@ ServiceHost Language="C#|VB" Debug="true" Service="ProcessService" %>
<% @ServiceHost Language="C#|VB" Debug="true" Service="ProcessService" %>
```

Because this service receives requests using the standard HTTP GET, you can use any RSS or ATOM-aware client to access the service. For example, you can view the output of this service by navigating to `http://localhost:8000/diagnostics/feed/?format=atom` or `http://localhost:8000/diagnostics/feed/?format=rss` in an RSS-aware browser.
Expand Down
6 changes: 3 additions & 3 deletions docs/framework/wcf/samples/transport-udp.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ if (soapBinding != null)
<system.serviceModel>
<client>
<metadata>
<wsdlImporters>
<policyImporters>
<extension type=" Microsoft.ServiceModel.Samples.UdpBindingElementImporter, UdpTransport" />
</policyImporters>
</metadata>
Expand Down Expand Up @@ -307,7 +307,7 @@ if (context.Endpoint.Binding is CustomBinding)
<system.serviceModel>
<extensions>
<bindingElementExtensions>
<add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport />
<add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport" />
</bindingElementExtensions>
</extensions>
</system.serviceModel>
Expand Down Expand Up @@ -363,7 +363,7 @@ protected override void OnApplyConfiguration(string configurationName)
<configSections>
<sectionGroup name="system.serviceModel">
<sectionGroup name="bindings">
<section name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport />
<section name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport" />
</sectionGroup>
</sectionGroup>
</configSections>
Expand Down
1 change: 0 additions & 1 deletion docs/framework/wcf/samples/unwrapped-messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ This sample demonstrates unwrapped messages. By default, the message body is for
<n2 xmlns="http://Microsoft.ServiceModel.Samples">15.99</n2>
</s:Body>
</s:Envelope>
</MessageLogTraceRecord>
```

The unwrapped message does not wrap the `n1` and `n2` parameters in a containing element, they are direct children of the soap body element.
Expand Down
1 change: 1 addition & 0 deletions docs/framework/wcf/samples/user-name-password-validator.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ serviceHost.Credentials. UserNameAuthentication.CustomUserNamePasswordValidator
-->
<userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.ServiceModel.Samples.CalculatorService+CustomUserNameValidator, service" />
...
</serviceCredentials>
</behavior>
</serviceBehaviors>
</behaviors>
Expand Down
1 change: 1 addition & 0 deletions docs/framework/wcf/samples/x-509-certificate-validator.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ serviceHost.Credentials.ClientCertificate.Authentication.CustomCertificateValida
customCertificateValidatorType =
"Microsoft.ServiceModel.Samples. CustomX509CertificateValidator, service" />
</clientCertificate>
</serviceCredentials>
...
</behavior>
</serviceBehaviors>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Provides a way to specify a bitmap source that does not have an embedded profile
## XAML Attribute Usage

```xml
<object property="{ColorConvertedBitmap imageSource sourceIIC destinationIIC}" .../>
<object property="{ColorConvertedBitmap imageSource sourceIIC destinationIIC}" ... />
```

## XAML Values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ Defines and references keys for resources that are loaded from external assembli
## XAML Attribute Usage (setting key, compact)

```xml
<object x:Key="{ComponentResourceKey {x:Type targetTypeName}, targetID}" .../>
<object x:Key="{ComponentResourceKey {x:Type targetTypeName}, targetID}" ... />
```

## XAML Attribute Usage (setting key, verbose)

```xml
<object x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type targetTypeName}, ResourceID=targetID}" .../>
<object x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type targetTypeName}, ResourceID=targetID}" ... />
```

## XAML Attribute Usage (requesting resource, compact)

```xml
<object property="{DynamicResource {ComponentResourceKey {x:Type targetTypeName}, targetID}}" .../>
<object property="{DynamicResource {ComponentResourceKey {x:Type targetTypeName}, targetID}}" ... />
```

## XAML Attribute Usage (requesting resource, verbose)

```xml
<object property="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type targetTypeName}, ResourceID=targetID}}" .../>
<object property="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type targetTypeName}, ResourceID=targetID}}" ... />
```

## XAML Values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ Provides a value for any [!INCLUDE[TLA2#tla_xaml](../../../../includes/tla2sharp
## XAML Attribute Usage

```xml
<object property="{DynamicResource key}" .../>
<object property="{DynamicResource key}" ... />
```

## XAML Property Element Usage

```xml
<object>
<object.property>
<DynamicResource ResourceKey="key" .../>
<DynamicResource ResourceKey="key" ... />
</object.property>
</object>
```
Expand Down Expand Up @@ -57,7 +57,7 @@ Provides a value for any [!INCLUDE[TLA2#tla_xaml](../../../../includes/tla2sharp
`DynamicResource` can also be used in a verbose attribute usage that specifies the <xref:System.Windows.DynamicResourceExtension.ResourceKey%2A> property as a property=value pair:

```xml
<object property="{DynamicResource ResourceKey=key}" .../>
<object property="{DynamicResource ResourceKey=key}" ... />
```

The verbose usage is often useful for extensions that have more than one settable property, or if some properties are optional. Because `DynamicResource` has only one settable property, which is required, this verbose usage is not typical.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ This topic provides an overview of how to package fonts with your [!INCLUDE[TLA#
<OutputType>library</OutputType>
...
</PropertyGroup>
...
...
<ItemGroup>
<Resource Include="Kooten.ttf" />
<Resource Include="Pesca.ttf" />
Expand Down
24 changes: 12 additions & 12 deletions docs/framework/wpf/advanced/propertypath-xaml-syntax.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ A key to understanding property paths in data binding is that you can target the
### Single Property on the Immediate Object as Data Context

```xml
<Binding Path="propertyName" .../>
<Binding Path="propertyName" ... />
```

*propertyName* must resolve to be the name of a property that is in the current <xref:System.Windows.FrameworkElement.DataContext%2A> for a <xref:System.Windows.Data.Binding.Path%2A> usage. If your binding updates the source, that property must be read/write and the source object must be mutable.
Expand All @@ -45,7 +45,7 @@ A key to understanding property paths in data binding is that you can target the
### Single Indexer on the Immediate Object as Data Context

```xml
<Binding Path="[key]" .../>
<Binding Path="[key]" ... />
```

`key` must be either the typed index to a dictionary or hash table, or the integer index of an array. Also, the value of the key must be a type that is directly bindable to the property where it is applied. For instance, a hash table that contains string keys and string values can be used this way to bind to Text for a <xref:System.Windows.Controls.TextBox>. Or, if the key points to a collection or subindex, you could use this syntax to bind to a target collection property. Otherwise, you need to reference a specific property, through a syntax such as `<Binding Path="[key].propertyName" .../>`.
Expand All @@ -57,7 +57,7 @@ You can specify the type of the index if necessary. For details on this aspect o
### Multiple Property (Indirect Property Targeting)

```xml
<Binding Path="propertyName.propertyName2" .../>
<Binding Path="propertyName.propertyName2" ... />
```

`propertyName` must resolve to be the name of a property that is the current <xref:System.Windows.FrameworkElement.DataContext%2A>. The path properties `propertyName` and `propertyName2` can be any properties that exist in a relationship, where `propertyName2` is a property that exists on the type that is the value of `propertyName`.
Expand All @@ -67,7 +67,7 @@ You can specify the type of the index if necessary. For details on this aspect o
### Single Property, Attached or Otherwise Type-Qualified

```xml
<object property="(ownerType.propertyName)" .../>
<object property="(ownerType.propertyName)" ... />
```

The parentheses indicate that this property in a <xref:System.Windows.PropertyPath> should be constructed using a partial qualification. It can use an XML namespace to find the type with an appropriate mapping. The `ownerType` searches types that a [!INCLUDE[TLA2#tla_xaml](../../../../includes/tla2sharptla-xaml-md.md)] processor has access to, through the <xref:System.Windows.Markup.XmlnsDefinitionAttribute> declarations in each assembly. Most applications have the default XML namespace mapped to the `http://schemas.microsoft.com/winfx/2006/xaml/presentation` namespace, so a prefix is usually only necessary for custom types or types otherwise outside that namespace. `propertyName` must resolve to be the name of a property existing on the `ownerType`. This syntax is generally used for one of the following cases:
Expand All @@ -85,7 +85,7 @@ For use as storyboard target, the property specified as `propertyName` must be a
### Source Traversal (Binding to Hierarchies of Collections)

```xml
<object Path="propertyName/propertyNameX" .../>
<object Path="propertyName/propertyNameX" ... />
```

The / in this syntax is used to navigate within a hierarchical data source object, and multiple steps into the hierarchy with successive / characters are supported. The source traversal accounts for the current record pointer position, which is determined by synchronizing the data with the UI of its view. For details on binding with hierarchical data source objects, and the concept of current record pointer in data binding, see [Use the Master-Detail Pattern with Hierarchical Data](../data/how-to-use-the-master-detail-pattern-with-hierarchical-data.md) or [Data Binding Overview](../../../desktop-wpf/data/data-binding-overview.md).
Expand All @@ -104,13 +104,13 @@ To reference the current record pointer for a collection view or master detail d
### Multiple Indexers

```xaml
<object Path="[index1,index2...]" .../>
<object Path="[index1,index2...]" ... />
```

or

```xaml
<object Path="propertyName[index,index2...]" .../>
<object Path="propertyName[index,index2...]" ... />
```

If a given object supports multiple indexers, those indexers can be specified in order, similar to an array referencing syntax. The object in question can be either the current context or the value of a property that contains a multiple index object.
Expand All @@ -124,7 +124,7 @@ By default, the indexer values are typed by using the characteristics of the und
Each of the syntaxes shown above can be interspersed. For instance, the following is an example that creates a property path to the color at a particular x,y of a `ColorGrid` property that contains a pixel grid array of <xref:System.Windows.Media.SolidColorBrush> objects:

```xml
<Rectangle Fill="{Binding ColorGrid[20,30].SolidColorBrushResult}" .../>
<Rectangle Fill="{Binding ColorGrid[20,30].SolidColorBrushResult}" ... />
```

### Escapes for Property Path Strings
Expand Down Expand Up @@ -169,7 +169,7 @@ In order to support cloning for animating a <xref:System.Windows.Freezable> that
### Single Property on the Target Object

```xml
<animation Storyboard.TargetProperty="propertyName" .../>
<animation Storyboard.TargetProperty="propertyName" ... />
```

`propertyName` must resolve to be the name of a dependency property that exists on the specified <xref:System.Windows.Media.Animation.Storyboard.TargetName%2A> type.
Expand All @@ -179,7 +179,7 @@ In order to support cloning for animating a <xref:System.Windows.Freezable> that
### Indirect Property Targeting

```xml
<animation Storyboard.TargetProperty="propertyName.propertyName2" .../>
<animation Storyboard.TargetProperty="propertyName.propertyName2" ... />
```

`propertyName` must be a property that is either a <xref:System.Windows.Freezable> value type or a primitive, which exists on the specified <xref:System.Windows.Media.Animation.Storyboard.TargetName%2A> type.
Expand All @@ -195,7 +195,7 @@ For instance, the <xref:System.Windows.Controls.Panel.Background%2A> property of
### Attached Properties

```xml
<animation Storyboard.TargetProperty="(ownerType.propertyName)" .../>
<animation Storyboard.TargetProperty="(ownerType.propertyName)" ... />
```

The parentheses indicate that this property in a <xref:System.Windows.PropertyPath> should be constructed using a partial qualification. It can use an XML namespace to find the type. The `ownerType` searches types that a [!INCLUDE[TLA2#tla_xaml](../../../../includes/tla2sharptla-xaml-md.md)] processor has access to, through the <xref:System.Windows.Markup.XmlnsDefinitionAttribute> declarations in each assembly. Most applications have the default XML namespace mapped to the `http://schemas.microsoft.com/winfx/2006/xaml/presentation` namespace, so a prefix is usually only necessary for custom types or types otherwise outside that namespace. `propertyName` must resolve to be the name of a property existing on the `ownerType`. The property specified as `propertyName` must be a <xref:System.Windows.DependencyProperty>. (All [!INCLUDE[TLA2#tla_winclient](../../../../includes/tla2sharptla-winclient-md.md)] attached properties are implemented as dependency properties, so this issue is only of concern for custom attached properties.)
Expand All @@ -205,7 +205,7 @@ The parentheses indicate that this property in a <xref:System.Windows.PropertyPa
### Indexers

```xml
<animation Storyboard.TargetProperty="propertyName.propertyName2[index].propertyName3" .../>
<animation Storyboard.TargetProperty="propertyName.propertyName2[index].propertyName3" ... />
```

Most dependency properties or <xref:System.Windows.Freezable> types do not support an indexer. Therefore, the only usage for an indexer in an animation path is at an intermediate position between the property that starts the chain on the named target and the eventual animated property. In the provided syntax, that is `propertyName2`. For instance, an indexer usage might be necessary if the intermediate property is a collection such as <xref:System.Windows.Media.TransformGroup>, in a property path such as `RenderTransform.Children[1].Angle`.
Expand Down
5 changes: 3 additions & 2 deletions docs/framework/wpf/advanced/relativesource-markupextension.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ Specifies properties of a <xref:System.Windows.Data.RelativeSource> binding sour
## XAML Attribute Usage

```xml
<Binding RelativeSource="{RelativeSource modeEnumValue}" .../>
<Binding RelativeSource="{RelativeSource modeEnumValue}" ... />
```

## XAML Attribute Usage (nested within Binding extension)

```xml
<object property="{Binding RelativeSource={RelativeSource modeEnumValue} ...}" .../>
<object property="{Binding RelativeSource={RelativeSource modeEnumValue} ...}" ... />
```

## XAML Object Element Usage
Expand Down Expand Up @@ -96,6 +96,7 @@ In the following example, the first <xref:System.Windows.Controls.TextBlock> in
</StackPanel>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
```

Describing data binding as a concept is not covered here, see [Data Binding Overview](../../../desktop-wpf/data/data-binding-overview.md).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ Provides a value for any [!INCLUDE[TLA2#tla_xaml](../../../../includes/tla2sharp
## XAML Attribute Usage

```xml
<object property="{StaticResource key}" .../>
<object property="{StaticResource key}" ... />
```

## XAML Object Element Usage

```xml
<object>
<object.property>
<StaticResource ResourceKey="key" .../>
<StaticResource ResourceKey="key" ... />
</object.property>
</object>
```
Expand Down Expand Up @@ -52,7 +52,7 @@ Provides a value for any [!INCLUDE[TLA2#tla_xaml](../../../../includes/tla2sharp
`StaticResource` can also be used in a verbose attribute usage that specifies the <xref:System.Windows.StaticResourceExtension.ResourceKey%2A> property as a property=value pair:

```xml
<object property="{StaticResource ResourceKey=key}" .../>
<object property="{StaticResource ResourceKey=key}" ... />
```

The verbose usage is often useful for extensions that have more than one settable property, or if some properties are optional. Because `StaticResource` has only one settable property, which is required, this verbose usage is not typical.
Expand Down
Loading