Skip to content
This repository has been archived by the owner on Mar 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #9 from juanlao/master
Browse files Browse the repository at this point in the history
Nuget Updated
  • Loading branch information
David Sanchez (MSFT) committed Mar 25, 2019
2 parents d48b708 + 7b25979 commit d845383
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 16 deletions.
10 changes: 5 additions & 5 deletions Source/CouponReader.Common/Services/CouponsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public List<Coupon> Coupons
Redeemed = false,
User = "Annick B. Addison",
UserName = "cbaddison1",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_1.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_1.png",
Expiration = DateTime.Now.AddYears(2)
},

Expand All @@ -48,7 +48,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Mathew Y. Rosendahl",
UserName = "lusi_123",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_2.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_2.png",
Expiration = DateTime.Now.AddYears(2).AddHours(7)
},

Expand All @@ -60,7 +60,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Gillian Carter",
UserName = "thecarter",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_3.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_3.png",
Expiration = DateTime.Now.AddYears(2).AddHours(6)
},

Expand All @@ -72,7 +72,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Jack Bains",
UserName = "bains_12345",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_4.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_4.png",
Expiration = DateTime.Now.AddYears(2)
},

Expand All @@ -84,7 +84,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Javier Suárez",
UserName = "jsuarez",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_5.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_5.png",
Expiration = DateTime.Now.AddYears(2).AddHours(5)
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="5.1.0-build.14.g97c3f5c88d" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.904-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.1147-ci" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions Source/CouponReader.Core.Common/Services/CouponsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public List<Coupon> Coupons
Redeemed = false,
User = "Annick B. Addison",
UserName = "cbaddison1",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_1.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_1.png",
Expiration = DateTime.Now.AddYears(2)
},

Expand All @@ -48,7 +48,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Mathew Y. Rosendahl",
UserName = "lusi_123",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_2.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_2.png",
Expiration = DateTime.Now.AddYears(2).AddHours(7)
},

Expand All @@ -60,7 +60,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Gillian Carter",
UserName = "thecarter",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_3.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_3.png",
Expiration = DateTime.Now.AddYears(2).AddHours(6)
},

Expand All @@ -72,7 +72,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Jack Bains",
UserName = "bains_12345",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_4.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_4.png",
Expiration = DateTime.Now.AddYears(2)
},

Expand All @@ -84,7 +84,7 @@ public List<Coupon> Coupons
Redeemed = true,
User = "Javier Suárez",
UserName = "jsuarez",
ImageUrl = "https://ttdesktopimgdev.blob.core.windows.net/coupons-images/Coupon_5.png",
ImageUrl = "https://tailwindtraders.blob.core.windows.net/desktop/Coupon_5.png",
Expiration = DateTime.Now.AddYears(2).AddHours(5)
}
};
Expand Down
7 changes: 4 additions & 3 deletions Source/CouponReader.Core.Wpf/CouponReader.Core.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<TargetFramework>netcoreapp3.0</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>tail.ico</ApplicationIcon>
<ApplicationManifest>app1.manifest</ApplicationManifest>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand All @@ -18,9 +19,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="5.1.0-build.14.g97c3f5c88d" />
<PackageReference Include="Prism.Core" Version="7.2.0.904-ci" />
<PackageReference Include="Prism.DryIoc" Version="7.2.0.904-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.904-ci" />
<PackageReference Include="Prism.Core" Version="7.2.0.1147-ci" />
<PackageReference Include="Prism.DryIoc" Version="7.2.0.1147-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.1147-ci" />
</ItemGroup>

<ItemGroup>
Expand Down
76 changes: 76 additions & 0 deletions Source/CouponReader.Core.Wpf/app1.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
Specifying requestedExecutionLevel element will disable file and registry virtualization.
Remove this element if your application requires this virtualization for backwards
compatibility.
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->

<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->

<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->

<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->

<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->

<!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
<maxversiontested Id="10.0.18295.0"/>
</application>
</compatibility>

<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
<!--
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
</windowsSettings>
</application>
-->

<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->

</assembly>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="5.1.0-build.14.g97c3f5c88d" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.904-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.1147-ci" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/WPFNetFX/WPFNetFX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<Version>5.1.0-build.14.g97c3f5c88d</Version>
</PackageReference>
<PackageReference Include="Prism.Wpf">
<Version>7.2.0.904-ci</Version>
<Version>7.2.0.1147-ci</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit d845383

Please sign in to comment.