Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a8ad5f4
Updates for day 1 deck
Foovanadil Sep 14, 2015
0e32e59
updates after introduction talk
Foovanadil Sep 14, 2015
d026e6f
Changes after XAML discussion
Foovanadil Sep 14, 2015
f7dcd9f
Add links File
Foovanadil Sep 14, 2015
e6fd161
Clean up link URL's
Foovanadil Sep 14, 2015
3255ee3
Updates after Layout discussion
Foovanadil Sep 14, 2015
01e8169
Update after transforms discussion
Foovanadil Sep 14, 2015
1c1716a
Day 1 Summary
Foovanadil Sep 14, 2015
b7c060a
Add Day 2 Student content. Fix organization of Student content on Day1.
Foovanadil Sep 15, 2015
4ccc0b8
Updated Links file and updated Demos after Framework Arch discussion
Foovanadil Sep 15, 2015
43cded8
Updates for Events and Commands
Foovanadil Sep 15, 2015
a809e84
Update after Resources and Styles Discussion
Foovanadil Sep 15, 2015
95cd22d
Update after Triggers discussion
Foovanadil Sep 16, 2015
ec0e5d0
Day 2 Summary and Day 3 content
Foovanadil Sep 16, 2015
8b335b8
Updates after Data Binding 1 discussion
Foovanadil Sep 16, 2015
5c3aa6b
Update after 2nd Data Binding discussion
Foovanadil Sep 16, 2015
67cbeaa
Updates after MVVM discussion
Foovanadil Sep 16, 2015
b1a6554
Adding Day 4 content
Foovanadil Sep 17, 2015
8163100
Added Day 3 summary
Foovanadil Sep 17, 2015
378ccfc
Update after first Control Template discussion
Foovanadil Sep 17, 2015
66d3fa4
Update after animation Discussion
Foovanadil Sep 17, 2015
d26ae5c
Update after CT talk 2
Foovanadil Sep 17, 2015
7c3133a
Update "after" lab to include shader dll
Foovanadil Sep 17, 2015
fc78b64
Updated Links file
Foovanadil Sep 17, 2015
01b8f44
Update links file and some Day 4 content. Add Day 5 content
Foovanadil Sep 18, 2015
b36c996
Update testing labs
Foovanadil Sep 18, 2015
8a41678
Update Testing pdf
Foovanadil Sep 18, 2015
50359c7
Updates after unit testing demo
Foovanadil Sep 18, 2015
512adc5
Update after Custom Control discussion
Foovanadil Sep 18, 2015
e3c0812
Updates after IoC discussion
Foovanadil Sep 18, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,7 @@ UpgradeLog*.htm

# Microsoft Fakes
FakesAssemblies/


!**/before/dependencies/*.dll
!**/after/dependencies/*.dll
22 changes: 22 additions & 0 deletions Day1/Demos/LayoutDemo/LayoutDemo/LayoutDemo.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LayoutDemo", "LayoutDemo\LayoutDemo.csproj", "{C5AB1F19-78EF-4BE1-B000-D74035100AB3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C5AB1F19-78EF-4BE1-B000-D74035100AB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5AB1F19-78EF-4BE1-B000-D74035100AB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5AB1F19-78EF-4BE1-B000-D74035100AB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5AB1F19-78EF-4BE1-B000-D74035100AB3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
6 changes: 6 additions & 0 deletions Day1/Demos/LayoutDemo/LayoutDemo/LayoutDemo/App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
</configuration>
9 changes: 9 additions & 0 deletions Day1/Demos/LayoutDemo/LayoutDemo/LayoutDemo/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Application x:Class="LayoutDemo.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:LayoutDemo"
StartupUri="MainWindow.xaml">
<Application.Resources>

</Application.Resources>
</Application>
17 changes: 17 additions & 0 deletions Day1/Demos/LayoutDemo/LayoutDemo/LayoutDemo/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;

namespace LayoutDemo
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}
}
106 changes: 106 additions & 0 deletions Day1/Demos/LayoutDemo/LayoutDemo/LayoutDemo/LayoutDemo.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C5AB1F19-78EF-4BE1-B000-D74035100AB3}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>LayoutDemo</RootNamespace>
<AssemblyName>LayoutDemo</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
84 changes: 84 additions & 0 deletions Day1/Demos/LayoutDemo/LayoutDemo/LayoutDemo/MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<Window x:Class="LayoutDemo.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Title="MainWindow"
Height="350"
Width="525">
<!--<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="50" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Button Grid.Column="0"
Content="Foosjbsfkhsfoshdfoshfoshfoishfosfhofshdofih"/>
<TextBlock Grid.Column="1"
Text="Barzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzdhbsfkhsefoshfosebfk"/>
<RadioButton Grid.Column="2"
Content="Radio Buttonsfsfsfsfsfsfsfsfsdfs"/>

</Grid>-->

<!--<DockPanel LastChildFill="True">
<Rectangle DockPanel.Dock="Top"
Width="50"
Height="50"
Fill="Black" />
<Rectangle DockPanel.Dock="Right"
Width="50"
Height="50"
Margin="5,0"
Fill="Red" />
<Rectangle DockPanel.Dock="Bottom"
Width="50"
Height="50"
Margin="5,0"
Fill="Blue" />
<Rectangle DockPanel.Dock="Left"
Width="50"
Height="50"
Fill="Yellow" />
<Rectangle Width="50"
Height="50"
Fill="Green" />
--><!--<Rectangle Width="50"
Height="50"
Fill="LightGoldenrodYellow" />--><!--
</DockPanel>-->

<!--<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100" />
<ColumnDefinition Width="3*" />
<ColumnDefinition Width="1*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ScrollViewer HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Disabled">
<TextBlock Text="Really long button text"
ToolTip="Really long button text" />
</ScrollViewer>
--><!--<Button Grid.Column="1"

Content="Button 2" />--><!--
<Button Grid.Column="2"
Content="Button 3" />
<Button Grid.Column="3"
Content="Button 4" />


</Grid>-->

<DockPanel x:Name="myGrid">
<ContentControl x:Name="myContentControl"
Height="150"
DockPanel.Dock="Top"
Content="Swap me out"/>
<Button DockPanel.Dock="Bottom" Content="1"/>
<Button DockPanel.Dock="Bottom" Content="Hello World" Click="ButtonBase_OnClick" />

</DockPanel>
</Window>
39 changes: 39 additions & 0 deletions Day1/Demos/LayoutDemo/LayoutDemo/LayoutDemo/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;

namespace LayoutDemo
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
//myGrid.Children.Add(new Button() {Content = "3", Opacity = .5});
}

private Window window2;
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
{
//window2 = new Window();
//window2.Owner = this;
//window2.Show();

myContentControl.Content = new Button() {Content = "Save"};
}
}
}
Loading