Changeset 1483


Ignore:
Timestamp:
2017-11-19 22:36:17 (4 weeks ago)
Author:
vesal
Message:

live 23

Location:
esimerkit/2017s/luennot/live23
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • esimerkit/2017s/luennot/live23/AutolaskuriProp/AutolaskuriProp.csproj

    r1482 r1483  
    1 <?xml version="1.0" encoding="utf-8"?> 
     1<?xml version="1.0" encoding="utf-8"?> 
    22<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
    33  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> 
     
    55    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 
    66    <Platform Condition=" '$(Platform)' == '' ">x86</Platform> 
    7     <ProjectGuid>{44ed9cf0-80d1-418c-b459-969f64887a3e}</ProjectGuid> 
     7    <ProjectGuid>{44ED9CF0-80D1-418C-B459-969F64887A3E}</ProjectGuid> 
    88    <OutputType>AppContainerExe</OutputType> 
    99    <AppDesignerFolder>Properties</AppDesignerFolder> 
     
    1818    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> 
    1919    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview> 
    20      
    2120    <PackageCertificateKeyFile>AutolaskuriProp_TemporaryKey.pfx</PackageCertificateKeyFile> 
    22      
    2321  </PropertyGroup> 
    2422  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> 
     
    9189    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain> 
    9290  </PropertyGroup> 
    93  
    9491  <PropertyGroup> 
    9592    <RestoreProjectStyle>PackageReference</RestoreProjectStyle> 
    9693  </PropertyGroup> 
    97  
    9894  <ItemGroup> 
    9995    <Compile Include="App.xaml.cs"> 
     
    109105      <SubType>Designer</SubType> 
    110106    </AppxManifest> 
    111      
    112107    <None Include="AutolaskuriProp_TemporaryKey.pfx" /> 
    113      
    114108  </ItemGroup> 
    115109  <ItemGroup> 
     
    133127    </Page> 
    134128  </ItemGroup> 
    135    
     129  <ItemGroup> 
     130    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform"> 
     131      <Version>5.2.3</Version> 
     132    </PackageReference> 
     133  </ItemGroup> 
    136134  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' "> 
    137135    <VisualStudioVersion>14.0</VisualStudioVersion> 
    138136  </PropertyGroup> 
    139  
    140137  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /> 
    141138  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.  
  • esimerkit/2017s/luennot/live23/AutolaskuriProp/MainPage.xaml

    r1482 r1483  
    99 
    1010    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> 
    11  
     11        <TextBox x:Name="LaskuriHA" Margin="10,63,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="164" FontSize="60" Foreground="Black" Background="#FF00F7F7" InputScope="Number" TextAlignment="Right" FontWeight="Bold" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" /> 
     12        <Button x:Name="ButtonHA" Content="HA" HorizontalAlignment="Left" Margin="10,213,0,0" VerticalAlignment="Top" Width="164" FontSize="60" Click="ButtonHA_Click" TabIndex="0" /> 
     13        <TextBox x:Name="LaskuriKA" Margin="179,63,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="164" FontSize="60" Foreground="Black"  Background="#FF00F7F7" InputScope="Number" TextAlignment="Right" FontWeight="Bold" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" /> 
     14        <Button x:Name="ButtonKA" Content="KA" HorizontalAlignment="Left" Margin="179,213,0,0" VerticalAlignment="Top" Width="164" FontSize="60" Click="ButtonKA_Click" TabIndex="2"/> 
     15        <Button x:Name="ButtonNollaa" Content="Nollaa" HorizontalAlignment="Left" Margin="50,348,0,0" VerticalAlignment="Top" Width="262" FontSize="40" Click="ButtonNollaa_Click" TabIndex="3"/> 
    1216    </Grid> 
    1317</Page> 
  • esimerkit/2017s/luennot/live23/live23.sln

    r1482 r1483  
    55MinimumVisualStudioVersion = 10.0.40219.1 
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutolaskuriBind", "AutolaskuriBind\AutolaskuriBind.csproj", "{118890CE-D45F-4436-9B32-8D21EB4726B3}" 
     7EndProject 
     8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutolaskuriProp", "AutolaskuriProp\AutolaskuriProp.csproj", "{44ED9CF0-80D1-418C-B459-969F64887A3E}" 
    79EndProject 
    810Global 
     
    3436                {118890CE-D45F-4436-9B32-8D21EB4726B3}.Release|x86.Build.0 = Release|x86 
    3537                {118890CE-D45F-4436-9B32-8D21EB4726B3}.Release|x86.Deploy.0 = Release|x86 
     38                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|ARM.ActiveCfg = Debug|ARM 
     39                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|ARM.Build.0 = Debug|ARM 
     40                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|ARM.Deploy.0 = Debug|ARM 
     41                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|x64.ActiveCfg = Debug|x64 
     42                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|x64.Build.0 = Debug|x64 
     43                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|x64.Deploy.0 = Debug|x64 
     44                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|x86.ActiveCfg = Debug|x86 
     45                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|x86.Build.0 = Debug|x86 
     46                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Debug|x86.Deploy.0 = Debug|x86 
     47                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|ARM.ActiveCfg = Release|ARM 
     48                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|ARM.Build.0 = Release|ARM 
     49                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|ARM.Deploy.0 = Release|ARM 
     50                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|x64.ActiveCfg = Release|x64 
     51                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|x64.Build.0 = Release|x64 
     52                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|x64.Deploy.0 = Release|x64 
     53                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|x86.ActiveCfg = Release|x86 
     54                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|x86.Build.0 = Release|x86 
     55                {44ED9CF0-80D1-418C-B459-969F64887A3E}.Release|x86.Deploy.0 = Release|x86 
    3656        EndGlobalSection 
    3757        GlobalSection(SolutionProperties) = preSolution 
Note: See TracChangeset for help on using the changeset viewer.