Skip to content

Commit d914eba

Browse files
paulbatumpaulbatum
committed
Added .gitattributes and normalized line endings.
1 parent 9eb0058 commit d914eba

File tree

5 files changed

+401
-379
lines changed

5 files changed

+401
-379
lines changed

‎.gitattributes

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
*.sln merge=union
7+
*.csproj merge=union
8+
*.vbproj merge=union
9+
*.fsproj merge=union
10+
*.dbproj merge=union
11+
12+
# Standard to msysgit
13+
*.doc diff=astextplain
14+
*.DOC diff=astextplain
15+
*.docx diff=astextplain
16+
*.DOCX diff=astextplain
17+
*.dot diff=astextplain
18+
*.DOT diff=astextplain
19+
*.pdf diff=astextplain
20+
*.PDF diff=astextplain
21+
*.rtf diff=astextplain
22+
*.RTF diff=astextplain

‎sdk/windowsphone/src/Microsoft.Azure.Zumo.WindowsPhone8.Managed/Properties/AssemblyInfo.cs

+42-42
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
3-
using System.Runtime.InteropServices;
4-
using System.Resources;
5-
6-
// General Information about an assembly is controlled through the following
7-
// set of attributes. Change these attribute values to modify the information
8-
// associated with an assembly.
9-
[assembly: AssemblyTitle("Microsoft.Azure.Zumo.WindowsPhone8.Managed")]
10-
[assembly: AssemblyDescription("")]
11-
[assembly: AssemblyConfiguration("")]
12-
[assembly: AssemblyCompany("")]
13-
[assembly: AssemblyProduct("Microsoft.Azure.Zumo.WindowsPhone8.Managed")]
14-
[assembly: AssemblyCopyright("Copyright © 2012")]
15-
[assembly: AssemblyTrademark("")]
16-
[assembly: AssemblyCulture("")]
17-
18-
// Setting ComVisible to false makes the types in this assembly not visible
19-
// to COM components. If you need to access a type in this assembly from
20-
// COM, set the ComVisible attribute to true on that type.
21-
[assembly: ComVisible(false)]
22-
23-
// The following GUID is for the ID of the typelib if this project is exposed to COM
24-
[assembly: Guid("7e9073fb-4d9b-405b-a587-60037077146d")]
25-
26-
// Version information for an assembly consists of the following four values:
27-
//
28-
// Major Version
29-
// Minor Version
30-
// Build Number
31-
// Revision
32-
//
33-
// You can specify all the values or you can default the Revision and Build Numbers
34-
// by using the '*' as shown below:
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
37-
[assembly: NeutralResourcesLanguageAttribute("en-US")]
38-
39-
#if SIGN
40-
[assembly: InternalsVisibleTo("Microsoft.Azure.Zumo.WindowsPhone8.CSharp.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
41-
#else
42-
[assembly: InternalsVisibleTo("Microsoft.Azure.Zumo.WindowsPhone8.CSharp.Test")]
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
using System.Resources;
5+
6+
// General Information about an assembly is controlled through the following
7+
// set of attributes. Change these attribute values to modify the information
8+
// associated with an assembly.
9+
[assembly: AssemblyTitle("Microsoft.Azure.Zumo.WindowsPhone8.Managed")]
10+
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyConfiguration("")]
12+
[assembly: AssemblyCompany("")]
13+
[assembly: AssemblyProduct("Microsoft.Azure.Zumo.WindowsPhone8.Managed")]
14+
[assembly: AssemblyCopyright("Copyright © 2012")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: AssemblyCulture("")]
17+
18+
// Setting ComVisible to false makes the types in this assembly not visible
19+
// to COM components. If you need to access a type in this assembly from
20+
// COM, set the ComVisible attribute to true on that type.
21+
[assembly: ComVisible(false)]
22+
23+
// The following GUID is for the ID of the typelib if this project is exposed to COM
24+
[assembly: Guid("7e9073fb-4d9b-405b-a587-60037077146d")]
25+
26+
// Version information for an assembly consists of the following four values:
27+
//
28+
// Major Version
29+
// Minor Version
30+
// Build Number
31+
// Revision
32+
//
33+
// You can specify all the values or you can default the Revision and Build Numbers
34+
// by using the '*' as shown below:
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]
37+
[assembly: NeutralResourcesLanguageAttribute("en-US")]
38+
39+
#if SIGN
40+
[assembly: InternalsVisibleTo("Microsoft.Azure.Zumo.WindowsPhone8.CSharp.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
41+
#else
42+
[assembly: InternalsVisibleTo("Microsoft.Azure.Zumo.WindowsPhone8.CSharp.Test")]
4343
#endif

‎sdk/windowsphone/test/Microsoft.Azure.Zumo.WindowsPhone8.CSharp.Test/MainPage.xaml

+122-122
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,123 @@
1-
<phone:PhoneApplicationPage
2-
x:Class="Microsoft.Azure.Zumo.WindowsPhone8.CSharp.Test.MainPage"
3-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
6-
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
7-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
mc:Ignorable="d"
10-
FontFamily="{StaticResource PhoneFontFamilyNormal}"
11-
FontSize="{StaticResource PhoneFontSizeNormal}"
12-
Foreground="{StaticResource PhoneForegroundBrush}"
13-
SupportedOrientations="Portrait" Orientation="Portrait"
14-
shell:SystemTray.IsVisible="True">
15-
<phone:PhoneApplicationPage.Resources>
16-
</phone:PhoneApplicationPage.Resources>
17-
18-
<!--LayoutRoot is the root grid where all page content is placed-->
19-
<Grid x:Name="LayoutRoot" Background="Transparent">
20-
<Grid.RowDefinitions>
21-
<RowDefinition Height="Auto"/>
22-
<RowDefinition Height="Auto"/>
23-
<RowDefinition Height="*"/>
24-
</Grid.RowDefinitions>
25-
26-
<!-- LOCALIZATION NOTE:
27-
To localize the displayed strings copy their values to appropriately named
28-
keys in the app's neutral language resource file (AppResources.resx) then
29-
replace the hard-coded text value between the attributes' quotation marks
30-
with the binding clause whose path points to that string name.
31-
32-
For example:
33-
34-
Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}"
35-
36-
This binding points to the template's string resource named "ApplicationTitle".
37-
38-
Adding supported languages in the Project Properties tab will create a
39-
new resx file per language that can carry the translated values of your
40-
UI strings. The binding in these examples will cause the value of the
41-
attributes to be drawn from the .resx file that matches the
42-
CurrentUICulture of the app at run time.
43-
-->
44-
45-
<!--TitlePanel contains the name of the application and page title-->
46-
<StackPanel Grid.Row="0">
47-
<TextBlock Text="PROJECT ZUMO" Style="{StaticResource PhoneTextNormalStyle}" FontSize="20" FontWeight="Bold"/>
48-
<TextBlock Text="Client library unit tests" Style="{StaticResource PhoneTextAccentStyle}" Foreground="#0094ff" FontSize="30" />
49-
<TextBlock TextWrapping="Wrap" Visibility="Collapsed" x:Name="lblStatus" Text="Status pending..." Style="{StaticResource PhoneTextNormalStyle}"/>
50-
<Grid x:Name="testSettings">
51-
<Grid.RowDefinitions>
52-
<RowDefinition Height="Auto"/>
53-
<RowDefinition Height="Auto"/>
54-
<RowDefinition Height="*"/>
55-
</Grid.RowDefinitions>
56-
<Grid.ColumnDefinitions>
57-
<ColumnDefinition Width="Auto"/>
58-
<ColumnDefinition Width="*"/>
59-
</Grid.ColumnDefinitions>
60-
61-
<TextBlock VerticalAlignment="Center" Style="{StaticResource PhoneTextNormalStyle}" Text="Runtime Uri:" Grid.Column="0" Grid.Row="0"/>
62-
<TextBlock VerticalAlignment="Center" Style="{StaticResource PhoneTextNormalStyle}" Text="Tags:" Grid.Column="0" Grid.Row="1"/>
63-
<TextBox x:Name="txtRuntimeUri" Grid.Column="1" Grid.Row="0" BorderThickness="0" Padding="0" FontSize="20"/>
64-
<TextBox x:Name="txtTags" Grid.Column="1" Grid.Row="1" FontSize="20" BorderThickness="0" Padding="0" />
65-
<Button Grid.Column="1" Content="Start" Grid.Row="2" Click="ExecuteTests" Margin="0" Padding="0" FontSize="20"/>
66-
</Grid>
67-
</StackPanel>
68-
69-
<!--ContentPanel - place additional content here-->
70-
<StackPanel x:Name="ContentPanel" Grid.Row="1" Margin="12,12,12,12">
71-
<phone:LongListSelector
72-
Height="560"
73-
Width="456"
74-
x:Name="lstTests"
75-
IsGroupingEnabled="True"
76-
BorderBrush="Red"
77-
BorderThickness="2">
78-
<phone:LongListSelector.GroupHeaderTemplate>
79-
<DataTemplate>
80-
<Border BorderThickness="0 0 0 1" BorderBrush="#666666" Margin="0 5 0 0" HorizontalAlignment="Stretch">
81-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
82-
<TextBlock Text="{Binding Name}" FontSize="30" />
83-
<TextBlock Text=" tests" FontSize="30"/>
84-
</StackPanel>
85-
</Border>
86-
</DataTemplate>
87-
</phone:LongListSelector.GroupHeaderTemplate>
88-
89-
<phone:LongListSelector.ItemTemplate>
90-
<DataTemplate>
91-
<StackPanel Margin="8 0">
92-
<TextBlock Text="{Binding Name}" Foreground="{Binding Brush}" FontSize="25" />
93-
<ItemsControl ItemsSource="{Binding Details}" Margin="15 0 0 0" FontSize="20" Foreground="LightGray" />
94-
</StackPanel>
95-
</DataTemplate>
96-
</phone:LongListSelector.ItemTemplate>
97-
</phone:LongListSelector>
98-
</StackPanel>
99-
100-
<StackPanel Grid.Row="2" Margin="12,0,12,0">
101-
<ProgressBar x:Name="progress"/>
102-
<StackPanel Orientation="Horizontal">
103-
<TextBlock Text="Zumo tests " Style="{StaticResource PhoneTextNormalStyle}"/>
104-
<TextBlock x:Name="lblCurrentTestNumber" Text="0"/>
105-
<TextBlock Text=" / "/>
106-
<TextBlock x:Name="lblTotalTestNumber" Text="0"/>
107-
<TextBlock Text=" (with "/>
108-
<TextBlock x:Name="lblFailureNumber" Text="0"/>
109-
<TextBlock Text=" failures)"/>
110-
</StackPanel>
111-
<TextBlock Foreground="#ffd800" x:Name="lblResults" Text="Results pending..." Style="{StaticResource PhoneTextNormalStyle}"/>
112-
</StackPanel>
113-
114-
<!--Uncomment to see an alignment grid to help ensure your controls are
115-
aligned on common boundaries. The image has a top margin of -32px to
116-
account for the System Tray. Set this to 0 (or remove the margin altogether)
117-
if the System Tray is hidden.
118-
119-
Before shipping remove this XAML and the image itself.-->
120-
<!--<Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" />-->
121-
</Grid>
122-
1+
<phone:PhoneApplicationPage
2+
x:Class="Microsoft.Azure.Zumo.WindowsPhone8.CSharp.Test.MainPage"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
6+
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
7+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
mc:Ignorable="d"
10+
FontFamily="{StaticResource PhoneFontFamilyNormal}"
11+
FontSize="{StaticResource PhoneFontSizeNormal}"
12+
Foreground="{StaticResource PhoneForegroundBrush}"
13+
SupportedOrientations="Portrait" Orientation="Portrait"
14+
shell:SystemTray.IsVisible="True">
15+
<phone:PhoneApplicationPage.Resources>
16+
</phone:PhoneApplicationPage.Resources>
17+
18+
<!--LayoutRoot is the root grid where all page content is placed-->
19+
<Grid x:Name="LayoutRoot" Background="Transparent">
20+
<Grid.RowDefinitions>
21+
<RowDefinition Height="Auto"/>
22+
<RowDefinition Height="Auto"/>
23+
<RowDefinition Height="*"/>
24+
</Grid.RowDefinitions>
25+
26+
<!-- LOCALIZATION NOTE:
27+
To localize the displayed strings copy their values to appropriately named
28+
keys in the app's neutral language resource file (AppResources.resx) then
29+
replace the hard-coded text value between the attributes' quotation marks
30+
with the binding clause whose path points to that string name.
31+
32+
For example:
33+
34+
Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}"
35+
36+
This binding points to the template's string resource named "ApplicationTitle".
37+
38+
Adding supported languages in the Project Properties tab will create a
39+
new resx file per language that can carry the translated values of your
40+
UI strings. The binding in these examples will cause the value of the
41+
attributes to be drawn from the .resx file that matches the
42+
CurrentUICulture of the app at run time.
43+
-->
44+
45+
<!--TitlePanel contains the name of the application and page title-->
46+
<StackPanel Grid.Row="0">
47+
<TextBlock Text="PROJECT ZUMO" Style="{StaticResource PhoneTextNormalStyle}" FontSize="20" FontWeight="Bold"/>
48+
<TextBlock Text="Client library unit tests" Style="{StaticResource PhoneTextAccentStyle}" Foreground="#0094ff" FontSize="30" />
49+
<TextBlock TextWrapping="Wrap" Visibility="Collapsed" x:Name="lblStatus" Text="Status pending..." Style="{StaticResource PhoneTextNormalStyle}"/>
50+
<Grid x:Name="testSettings">
51+
<Grid.RowDefinitions>
52+
<RowDefinition Height="Auto"/>
53+
<RowDefinition Height="Auto"/>
54+
<RowDefinition Height="*"/>
55+
</Grid.RowDefinitions>
56+
<Grid.ColumnDefinitions>
57+
<ColumnDefinition Width="Auto"/>
58+
<ColumnDefinition Width="*"/>
59+
</Grid.ColumnDefinitions>
60+
61+
<TextBlock VerticalAlignment="Center" Style="{StaticResource PhoneTextNormalStyle}" Text="Runtime Uri:" Grid.Column="0" Grid.Row="0"/>
62+
<TextBlock VerticalAlignment="Center" Style="{StaticResource PhoneTextNormalStyle}" Text="Tags:" Grid.Column="0" Grid.Row="1"/>
63+
<TextBox x:Name="txtRuntimeUri" Grid.Column="1" Grid.Row="0" BorderThickness="0" Padding="0" FontSize="20"/>
64+
<TextBox x:Name="txtTags" Grid.Column="1" Grid.Row="1" FontSize="20" BorderThickness="0" Padding="0" />
65+
<Button Grid.Column="1" Content="Start" Grid.Row="2" Click="ExecuteTests" Margin="0" Padding="0" FontSize="20"/>
66+
</Grid>
67+
</StackPanel>
68+
69+
<!--ContentPanel - place additional content here-->
70+
<StackPanel x:Name="ContentPanel" Grid.Row="1" Margin="12,12,12,12">
71+
<phone:LongListSelector
72+
Height="560"
73+
Width="456"
74+
x:Name="lstTests"
75+
IsGroupingEnabled="True"
76+
BorderBrush="Red"
77+
BorderThickness="2">
78+
<phone:LongListSelector.GroupHeaderTemplate>
79+
<DataTemplate>
80+
<Border BorderThickness="0 0 0 1" BorderBrush="#666666" Margin="0 5 0 0" HorizontalAlignment="Stretch">
81+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
82+
<TextBlock Text="{Binding Name}" FontSize="30" />
83+
<TextBlock Text=" tests" FontSize="30"/>
84+
</StackPanel>
85+
</Border>
86+
</DataTemplate>
87+
</phone:LongListSelector.GroupHeaderTemplate>
88+
89+
<phone:LongListSelector.ItemTemplate>
90+
<DataTemplate>
91+
<StackPanel Margin="8 0">
92+
<TextBlock Text="{Binding Name}" Foreground="{Binding Brush}" FontSize="25" />
93+
<ItemsControl ItemsSource="{Binding Details}" Margin="15 0 0 0" FontSize="20" Foreground="LightGray" />
94+
</StackPanel>
95+
</DataTemplate>
96+
</phone:LongListSelector.ItemTemplate>
97+
</phone:LongListSelector>
98+
</StackPanel>
99+
100+
<StackPanel Grid.Row="2" Margin="12,0,12,0">
101+
<ProgressBar x:Name="progress"/>
102+
<StackPanel Orientation="Horizontal">
103+
<TextBlock Text="Zumo tests " Style="{StaticResource PhoneTextNormalStyle}"/>
104+
<TextBlock x:Name="lblCurrentTestNumber" Text="0"/>
105+
<TextBlock Text=" / "/>
106+
<TextBlock x:Name="lblTotalTestNumber" Text="0"/>
107+
<TextBlock Text=" (with "/>
108+
<TextBlock x:Name="lblFailureNumber" Text="0"/>
109+
<TextBlock Text=" failures)"/>
110+
</StackPanel>
111+
<TextBlock Foreground="#ffd800" x:Name="lblResults" Text="Results pending..." Style="{StaticResource PhoneTextNormalStyle}"/>
112+
</StackPanel>
113+
114+
<!--Uncomment to see an alignment grid to help ensure your controls are
115+
aligned on common boundaries. The image has a top margin of -32px to
116+
account for the System Tray. Set this to 0 (or remove the margin altogether)
117+
if the System Tray is hidden.
118+
119+
Before shipping remove this XAML and the image itself.-->
120+
<!--<Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" />-->
121+
</Grid>
122+
123123
</phone:PhoneApplicationPage>

0 commit comments

Comments
 (0)