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

Update sample to build projection for AnyCPU #1098

Merged
merged 5 commits into from
Feb 7, 2022
Merged

Update sample to build projection for AnyCPU #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bcde84
Build projection for AnyCPU
angelazhangmsft Feb 2, 2022
ce44274
feeedback
angelazhangmsft Feb 4, 2022
d9fe80a
Delete SimpleMathComponent.0.1.2-prerelease.nupkg
angelazhangmsft Feb 4, 2022
0dc37c9
formatting nuspec
angelazhangmsft Feb 4, 2022
d0a88bc
Merge branch 'master' into angzhang/projectionsample
angelazhangmsft Feb 4, 2022
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
16 changes: 14 additions & 2 deletions src/Samples/NetProjectionSample/ConsoleAppSample.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30509.190
# Visual Studio Version 17
VisualStudioVersion = 17.0.32014.148
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppSample", "ConsoleAppSample\ConsoleAppSample.csproj", "{9623756E-90CE-449C-8BD8-36A2F8419DBF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Debug|ARM64.ActiveCfg = Debug|ARM64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Debug|ARM64.Build.0 = Debug|ARM64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Debug|x64.ActiveCfg = Debug|x64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Debug|x64.Build.0 = Debug|x64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Debug|x86.ActiveCfg = Debug|x86
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Debug|x86.Build.0 = Debug|x86
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Release|ARM64.ActiveCfg = Release|ARM64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Release|ARM64.Build.0 = Release|ARM64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Release|x64.ActiveCfg = Release|x64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Release|x64.Build.0 = Release|x64
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Release|x86.ActiveCfg = Release|x86
{9623756E-90CE-449C-8BD8-36A2F8419DBF}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
11 changes: 6 additions & 5 deletions src/Samples/NetProjectionSample/CppWinRTComponentProjectionSample.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ Global
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Debug|x64.ActiveCfg = Debug|x64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Debug|x64.Build.0 = Debug|x64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Debug|x86.ActiveCfg = Debug|x64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|ARM64.ActiveCfg = Release|ARM64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|ARM64.Build.0 = Release|ARM64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|x64.ActiveCfg = Release|x64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|x64.Build.0 = Release|x64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|x86.ActiveCfg = Release|x64
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|ARM64.ActiveCfg = Release|Any CPU
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|ARM64.Build.0 = Release|Any CPU
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|x64.ActiveCfg = Release|Any CPU
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|x64.Build.0 = Release|Any CPU
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|x86.ActiveCfg = Release|Any CPU
{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}.Release|x86.Build.0 = Release|Any CPU
{D6B0C16D-858A-4C1B-99CF-D6F4CF5BCD5F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{D6B0C16D-858A-4C1B-99CF-D6F4CF5BCD5F}.Debug|ARM64.Build.0 = Debug|ARM64
{D6B0C16D-858A-4C1B-99CF-D6F4CF5BCD5F}.Debug|x64.ActiveCfg = Debug|x64
Expand Down
5 changes: 4 additions & 1 deletion src/Samples/NetProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
<!-- Note: target .NET 5 by setting the TargetFramework to net5.0-windows10.0.19041.0 -->
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<Platforms>x64;x86;ARM64</Platforms>
<!-- Set Platform to AnyCPU to allow consumption of the projection assembly from any architecture. -->
<Platform>AnyCPU</Platform>
<!-- Workaround for MSB3271 error on processor architecture mismatch -->
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
</PropertyGroup>

<ItemGroup>
Expand Down
30 changes: 16 additions & 14 deletions src/Samples/NetProjectionSample/SimpleMathProjection/nuget/SimpleMathProjection.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>SimpleMathComponent</id>
<version>0.1.0-prerelease</version>
<authors>Contoso Math Inc.</authors>
<description>A simple component with basic math operations</description>
<dependencies>
<metadata>
<id>SimpleMathComponent</id>
<version>0.1.0-prerelease</version>
<authors>Contoso Math Inc.</authors>
<description>A simple component with basic math operations</description>
<dependencies>
<!--Note: Target .NET 5 by replacing instances of "net6.0" with "net5.0 in this file"-->
<group targetFramework="net6.0-windows10.0.19041.0" />
</dependencies>
</metadata>
<files>
<!--Note: This sample assumes the configuration/platform are set to Release/x64-->
<!--Projection assembly is architecture-neutral-->
<file src="..\..\_build\x64\Release\SimpleMathProjection\bin\SimpleMathProjection.dll" target="lib\net6.0-windows10.0.19041.0\SimpleMathProjection.dll" />
<!--Arch-specific implementation DLLs should be copied into RID-relative folders -->
</dependencies>
</metadata>
<files>
<!--Note: This sample assumes the solution configuration and platform are set to Release and x64-->
<file src="..\..\_build\AnyCPU\Release\SimpleMathProjection\bin\SimpleMathProjection.dll" target="lib\net6.0-windows10.0.19041.0\SimpleMathProjection.dll" />
<!--Arch-specific implementation DLLs should be copied into RID-relative folders-->
<file src="..\..\_build\x64\Release\SimpleMathComponent\bin\SimpleMathComponent\SimpleMathComponent.dll" target="runtimes\win10-x64\native\SimpleMathComponent.dll" />
</files>
<!--To support x86 and ARM64, build SimpleMathComponent for those other architectures and uncomment the entries below.-->
<!--<file src="..\..\_build\Win32\Release\SimpleMathComponent\bin\SimpleMathComponent\SimpleMathComponent.dll" target="runtimes\win10-x86\native\SimpleMathComponent.dll" />-->
<!--<file src="..\..\_build\arm64\Release\SimpleMathComponent\bin\SimpleMathComponent\SimpleMathComponent.dll" target="runtimes\win10-arm64\native\SimpleMathComponent.dll" />-->
</files>
</package>