-
Notifications
You must be signed in to change notification settings - Fork 413
Add C#/WinRT Projection dlls for AppLifecycle and DynamicDependency #887
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework> | ||
| <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion> | ||
| <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we need to set TFM and TPMinV differently for our projections? Shouldn't we just set TFM=17763? I don't believe the projections (or the component itself) does any lightup on 18362? |
||
| <Platforms>x64;x86</Platforms> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. arm64? |
||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| </PropertyGroup> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,8 +17,8 @@ | |
| <ApplicationType>Windows Store</ApplicationType> | ||
| <ApplicationTypeRevision>10.0</ApplicationTypeRevision> | ||
| <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same as above - can't all this be 17763 or does the component actually do lightup? |
||
| <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion> | ||
| <!-- Need to add this otherwise the ADO build won't copy mrm.dll to output directory, and eventually the file will miss in ManagedTest.build.appxrecipe and make | ||
| <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion> | ||
| <!-- Need to add this otherwise the ADO build won't copy mrm.dll to output directory, and eventually the file will miss in ManagedTest.build.appxrecipe and make | ||
| the tests fail to run in ADO pipeline --> | ||
| <BuildingInsideVisualStudio>true</BuildingInsideVisualStudio> | ||
| </PropertyGroup> | ||
|
|
@@ -150,7 +150,7 @@ | |
| <!-- Configure the release build binary to be as required by internal API scanning tools. --> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| <OptimizeReferences>true</OptimizeReferences> | ||
| <LinkIncremental>false</LinkIncremental> | ||
| <LinkIncremental>false</LinkIncremental> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
|
|
@@ -218,4 +218,4 @@ | |
| <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" /> | ||
| <Error Condition="!Exists('..\..\packages\Microsoft.FrameworkUdk.$(Udk-Arch)fre.10.0.21363.1000-210416-1731.co-release-svc-reunion2104\build\native\Microsoft.FrameworkUdk.$(Udk-Arch)fre.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.FrameworkUdk.$(Udk-Arch)fre.10.0.21363.1000-210416-1731.co-release-svc-reunion2104\build\native\Microsoft.FrameworkUdk.$(Udk-Arch)fre.targets'))" /> | ||
| </Target> | ||
| </Project> | ||
| </Project> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. set TFM=17763 and remove the TPMinV |
||
| <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> | ||
| <Platforms>x64;x86</Platforms> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. arm64 |
||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.2.2" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- For consistency across Reunion, explicitly reference .NET 5.0.5 SDK (5.0.202 train for VS 16.9.3) --> | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. MRTCore had this which is puzzling AH as I don't see any mention of .NET 5.0.5, 5.0.202 or VS 16.9.3 in the And this sort of this would be best commonly defined for the repo e.g. in Directory.build.props and use the common definitions across the repository Even better: instead of defining versions in
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. those versions are wrong.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @Scottj1s can we drop the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove the framework reference overrides in a component - those are needed by an app for a temporary situation to avoid mem leaks that were fixed in the .16 update. That will come to all apps by default in the next .NET5 SDK update |
||
| <ItemGroup> | ||
| <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.16" /> | ||
| <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.16" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\ProjectReunion_DLL\ProjectReunion_DLL.vcxproj" > | ||
| <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <CSWinRTIncludes>Microsoft.Windows.AppLifecycle</CSWinRTIncludes> | ||
| <CSWinRTWindowsMetadata>10.0.18362.0</CSWinRTWindowsMetadata> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Configure the release build binary to be as required by internal API scanning tools. --> | ||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | ||
| <DebugType>pdbonly</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <CsWinRTInputs Include="$(OutDir)/**/*.winmd" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0-windows10.0.18362.0</TargetFramework> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. set TFM=17763 unless it requires a newer api, remove TPMinV |
||
| <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> | ||
| <Platforms>x64;x86</Platforms> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.2.2" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- For consistency across Reunion, explicitly reference .NET 5.0.5 SDK (5.0.202 train for VS 16.9.3) --> | ||
| <ItemGroup> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove the frameworkreference overrides. this should only be specified by apps and is temporary until the next netsdk update |
||
| <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.16" /> | ||
| <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.16" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\ProjectReunion_DLL\ProjectReunion_DLL.vcxproj" > | ||
| <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <CSWinRTIncludes>Microsoft.Windows.ApplicationModel.DynamicDependency</CSWinRTIncludes> | ||
| <CSWinRTWindowsMetadata>10.0.18362.0</CSWinRTWindowsMetadata> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Configure the release build binary to be as required by internal API scanning tools. --> | ||
| <PropertyGroup Condition="'$(Configuration)'=='Release'"> | ||
| <DebugType>pdbonly</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <CsWinRTInputs Include="$(OutDir)/**/*.winmd" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is
Debug_testfor anyway? Looks like everything's got them but we never use them (that I know of). Delete them all?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
uhh, i thought you added that. But it's existing. It does change IsTDPConfiguration to true, although nobody seems to use IsTDPConfiguration. I guess it's ok to leave it alone.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any idea what
Debug_testis for? I never saw it before last year in ProjectReunion.sln.I added the project via VS on a PC which I think doesn't have TDP installed, if that matters
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
related to TAEF testing configurations? if it looks like cruft, I'd drop it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drop all of them or just these additions?