Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update AuthoringDemo sample to 1.1.4 #772

Merged
merged 4 commits into from
Mar 17, 2021
Merged

Update AuthoringDemo sample to 1.1.4 #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06a5083
update authoringdemo sample
angelazhangmsft Mar 16, 2021
ce25485
update to 1.1.4
angelazhangmsft Mar 17, 2021
1bd4e30
Update README.md
angelazhangmsft Mar 17, 2021
b823219
Merge branch 'master' into angzhang/updateauthoringdemo
angelazhangmsft Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Samples/AuthoringDemo/AuthoringDemo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7E449DC2-5334-464D-B478-1715B96C8050}.Debug|x64.ActiveCfg = Debug|x64
{7E449DC2-5334-464D-B478-1715B96C8050}.Debug|x64.Build.0 = Debug|x64
{7E449DC2-5334-464D-B478-1715B96C8050}.Debug|x86.ActiveCfg = Debug|x64
{7E449DC2-5334-464D-B478-1715B96C8050}.Release|x64.ActiveCfg = Release|x64
{7E449DC2-5334-464D-B478-1715B96C8050}.Release|x64.Build.0 = Release|x64
{7E449DC2-5334-464D-B478-1715B96C8050}.Release|x86.ActiveCfg = Release|x64
{96752AD7-C344-4D4D-9E0B-39BED88B191A}.Debug|x64.ActiveCfg = Debug|x64
{96752AD7-C344-4D4D-9E0B-39BED88B191A}.Debug|x64.Build.0 = Debug|x64
{96752AD7-C344-4D4D-9E0B-39BED88B191A}.Debug|x86.ActiveCfg = Debug|Win32
Expand Down
2 changes: 1 addition & 1 deletion src/Samples/AuthoringDemo/AuthoringDemo/AuthoringDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.1.2-prerelease.210208.6" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.1.4" />
</ItemGroup>

<!-- NuGet package generation properties -->
Expand Down
2 changes: 0 additions & 2 deletions src/Samples/AuthoringDemo/CppConsoleApp/CppConsoleApp.exe.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
name="AuthoringDemo.Example"
threadingModel="both"
xmlns="urn:schemas-microsoft-com:winrt.v1" />
</file>
<file name="WinRT.Host.dll">
<activatableClass
name="AuthoringDemo.FolderEnumeration"
threadingModel="both"
Expand Down
3 changes: 0 additions & 3 deletions src/Samples/AuthoringDemo/CppConsoleApp/CppConsoleApp.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="WinRT.Host.runtimeconfig.json">
<DeploymentContent>true</DeploymentContent>
</None>
</ItemGroup>
<ItemGroup>
<Manifest Include="CppConsoleApp.exe.manifest">
Expand Down
10 changes: 0 additions & 10 deletions src/Samples/AuthoringDemo/CppConsoleApp/WinRT.Host.runtimeconfig.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Samples/AuthoringDemo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# C#/WinRT Authoring Sample

This sample demonstrates how to author a simple C#/WinRT component, create a NuGet package for the component, and consume the component as a package reference from a C++/WinRT console app. This sample currently uses [CsWinRT version 1.1.1](https://www.nuget.org/packages/Microsoft.Windows.CsWinRT/1.1.1). Refer to the [authoring docs](https://github.com/microsoft/CsWinRT/blob/master/docs/authoring.md) for more details.
This sample demonstrates how to author a simple C#/WinRT component, create a NuGet package for the component, and consume the component as a package reference from a C++/WinRT console app. This sample currently uses [CsWinRT version 1.1.4](https://www.nuget.org/packages/Microsoft.Windows.CsWinRT/1.1.4). Refer to the [authoring docs](https://github.com/microsoft/CsWinRT/blob/master/docs/authoring.md) for more details.

- **AuthoringDemo** is is a C# .NET 5 authored component using a **Class Library (.NET Core)** project with some project file modifications. There are two runtime classes authored in *Example.cs* and *FolderEnumeration.cs*, which demonstrate the usage of basic types and WinRT types.

Expand Down