Skip to content

Commit

Permalink
Modification of ExpenseItIntro.vbproj (microsoft#253)
Browse files Browse the repository at this point in the history
* Modification of ExpenseItIntro.vbproj, adding it to GettingStarted.sln and WPFSamples.sln, removing GenerateAssemblyInfo settings from accessibility sample apps

* removed assemblyInfo.cs files from accessibility projects

* Renamed ExpenseItIntro vbproj to ExpenseItIntro2.vbproj, removed assemblyInfo.vb
  • Loading branch information
vartikav authored Jan 27, 2020
1 parent 749948e commit c2d9f24
Show file tree
Hide file tree
Showing 20 changed files with 124 additions and 508 deletions.
31 changes: 19 additions & 12 deletions Getting Started/GettingStarted.sln
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23103.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlsAndLayout", "ControlsAndLayout\ControlsAndLayout\ControlsAndLayout.csproj", "{AC167A27-1309-4A7C-842F-A971AE067C96}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlsAndLayout", "ControlsAndLayout\ControlsAndLayout\ControlsAndLayout.csproj", "{AC167A27-1309-4A7C-842F-A971AE067C96}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Concepts", "Concepts\Concepts.csproj", "{D3B9551D-FE81-4DD9-BCF1-5470C4DDF877}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Concepts", "Concepts\Concepts.csproj", "{D3B9551D-FE81-4DD9-BCF1-5470C4DDF877}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "HelloWorld\HelloWorld.csproj", "{DDBCF377-2D29-440D-9FDB-02B4936E2D80}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld", "HelloWorld\HelloWorld.csproj", "{DDBCF377-2D29-440D-9FDB-02B4936E2D80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicLayout", "DynamicLayout\DynamicLayout.csproj", "{40955500-41BB-45B2-B8BC-9AFA10C879EA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicLayout", "DynamicLayout\DynamicLayout.csproj", "{40955500-41BB-45B2-B8BC-9AFA10C879EA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComplexLayout", "ComplexLayout\ComplexLayout.csproj", "{11A2B748-2F85-44B6-B390-81559C136DC4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComplexLayout", "ComplexLayout\ComplexLayout.csproj", "{11A2B748-2F85-44B6-B390-81559C136DC4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiPage", "MultiPage\MultiPage.csproj", "{8BB5C536-404D-4E91-8C2D-61D0D6494D67}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiPage", "MultiPage\MultiPage.csproj", "{8BB5C536-404D-4E91-8C2D-61D0D6494D67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleLayout", "SimpleLayout\SimpleLayout.csproj", "{2D81B26B-2525-41EA-9CBC-A4AA3B29579C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleLayout", "SimpleLayout\SimpleLayout.csproj", "{2D81B26B-2525-41EA-9CBC-A4AA3B29579C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpenseItIntro", "WalkthroughFirstWPFApp\csharp\ExpenseItIntro.csproj", "{04A305B4-D6A2-458B-817C-7B0AA88F7FCA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExpenseItIntro", "WalkthroughFirstWPFApp\csharp\ExpenseItIntro.csproj", "{04A305B4-D6A2-458B-817C-7B0AA88F7FCA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExpenseItIntro2", "WalkthroughFirstWPFApp\vb\ExpenseItIntro.vbproj", "{B7A77E2B-932E-465E-BDFA-8AF218B8854F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -48,17 +50,22 @@ Global
{8BB5C536-404D-4E91-8C2D-61D0D6494D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BB5C536-404D-4E91-8C2D-61D0D6494D67}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BB5C536-404D-4E91-8C2D-61D0D6494D67}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8BB5C536-404D-4E91-8C2D-61D0D6494D67}.Release|Any CPU.Build.0 = Release|Any CPU
{2D81B26B-2525-41EA-9CBC-A4AA3B29579C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D81B26B-2525-41EA-9CBC-A4AA3B29579C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D81B26B-2525-41EA-9CBC-A4AA3B29579C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D81B26B-2525-41EA-9CBC-A4AA3B29579C}.Release|Any CPU.Build.0 = Release|Any CPU
{04A305B4-D6A2-458B-817C-7B0AA88F7FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{04A305B4-D6A2-458B-817C-7B0AA88F7FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04A305B4-D6A2-458B-817C-7B0AA88F7FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04A305B4-D6A2-458B-817C-7B0AA88F7FCA}.Release|Any CPU.Build.0 = Release|Any CPU
{B7A77E2B-932E-465E-BDFA-8AF218B8854F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B7A77E2B-932E-465E-BDFA-8AF218B8854F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7A77E2B-932E-465E-BDFA-8AF218B8854F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7A77E2B-932E-465E-BDFA-8AF218B8854F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F4FAD40C-CDA6-434E-B4BC-2D88AE2D2F0A}
EndGlobalSection
EndGlobal
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.0</TargetFramework>
<UseWPF>true</UseWPF>
<OutputType>WinExe</OutputType>
<RootNamespace>ExpenseIt9</RootNamespace>
<AssemblyName>ExpenseIt9</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
Expand Down
2 changes: 2 additions & 0 deletions Getting Started/WalkthroughFirstWPFApp/vb/Application.xaml.vb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Imports System.Windows

Namespace ExpenseIt9
''' <summary>
''' Interaction logic for App.xaml
Expand Down
31 changes: 17 additions & 14 deletions Getting Started/WalkthroughFirstWPFApp/vb/ExpenseItHome.xaml.vb
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
Imports System.Windows
Imports System.Windows.Controls

Namespace ExpenseIt
''' <summary>
''' Interaction logic for ExpenseItHome.xaml
''' </summary>
Partial Public Class ExpenseItHome
Inherits Page
Public Sub New()
InitializeComponent()
End Sub
''' <summary>
''' Interaction logic for ExpenseItHome.xaml
''' </summary>
Partial Public Class ExpenseItHome
Inherits Page
Public Sub New()
InitializeComponent()
End Sub


Private Sub Button_Click(ByVal sender As Object, ByVal e As RoutedEventArgs)
' View Expense Report
Dim expenseReportPage As New ExpenseReportPage(Me.peopleListBox.SelectedItem)
Me.NavigationService.Navigate(expenseReportPage)
Private Sub Button_Click(ByVal sender As Object, ByVal e As RoutedEventArgs)
' View Expense Report
Dim expenseReportPage As New ExpenseReportPage(Me.peopleListBox.SelectedItem)
Me.NavigationService.Navigate(expenseReportPage)

End Sub
End Sub

End Class
End Class
End Namespace
20 changes: 0 additions & 20 deletions Getting Started/WalkthroughFirstWPFApp/vb/ExpenseItIntro.sln

This file was deleted.

148 changes: 0 additions & 148 deletions Getting Started/WalkthroughFirstWPFApp/vb/ExpenseItIntro.vbproj

This file was deleted.

25 changes: 25 additions & 0 deletions Getting Started/WalkthroughFirstWPFApp/vb/ExpenseItIntro2.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "ExpenseItIntro2", "ExpenseItIntro2.vbproj", "{270A838B-4FC0-4E19-9AD0-1AF088740203}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{270A838B-4FC0-4E19-9AD0-1AF088740203}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{270A838B-4FC0-4E19-9AD0-1AF088740203}.Debug|Any CPU.Build.0 = Release|Any CPU
{270A838B-4FC0-4E19-9AD0-1AF088740203}.Release|Any CPU.ActiveCfg = Release|Any CPU
{270A838B-4FC0-4E19-9AD0-1AF088740203}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {55B96E49-A987-4FCF-8683-DD7B781115EB}
EndGlobalSection
EndGlobal
16 changes: 16 additions & 0 deletions Getting Started/WalkthroughFirstWPFApp/vb/ExpenseItIntro2.vbproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<UseWPF>true</UseWPF>
<OutputType>WinExe</OutputType>
<RootNamespace>ExpenseIt9</RootNamespace>
<AssemblyName>ExpenseIt9</AssemblyName>
<LangVersion>14.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Resource Include="watermark.png" />
</ItemGroup>
</Project>
32 changes: 17 additions & 15 deletions Getting Started/WalkthroughFirstWPFApp/vb/ExpenseReportPage.xaml.vb
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
Imports System.Windows.Controls

Namespace ExpenseIt
''' <summary>
''' Interaction logic for ExpenseReportPage.xaml
''' </summary>
''' <summary>
''' Interaction logic for ExpenseReportPage.xaml
''' </summary>

Partial Public Class ExpenseReportPage
Inherits Page
Public Sub New()
InitializeComponent()
End Sub
Partial Public Class ExpenseReportPage
Inherits Page
Public Sub New()
InitializeComponent()
End Sub

' Custom constructor to pass expense report data
Public Sub New(ByVal data As Object)
Me.New()
' Bind to expense report data.
Me.DataContext = data
End Sub
' Custom constructor to pass expense report data
Public Sub New(ByVal data As Object)
Me.New()
' Bind to expense report data.
Me.DataContext = data
End Sub

End Class
End Class

End Namespace
20 changes: 11 additions & 9 deletions Getting Started/WalkthroughFirstWPFApp/vb/MainWindow.xaml.vb
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
Imports System.Windows.Navigation

Namespace ExpenseIt
''' <summary>
''' Interaction logic for MainWindow.xaml
''' </summary>
Partial Public Class MainWindow
Inherits NavigationWindow
Public Sub New()
InitializeComponent()
End Sub
End Class
''' <summary>
''' Interaction logic for MainWindow.xaml
''' </summary>
Partial Public Class MainWindow
Inherits NavigationWindow
Public Sub New()
InitializeComponent()
End Sub
End Class
End Namespace
Loading

0 comments on commit c2d9f24

Please sign in to comment.