Граф коммитов

69 Коммитов

Автор SHA1 Сообщение Дата
Geoffrey Trousdale b69eef0ca5 Update TargetPlatformVersion to 22621, remove net5 from name of project, change nuget dependency 2023-02-21 10:52:32 -05:00
Geoffrey Trousdale a4af82f261 Update to toolchain 143 and update projection project to .NET 6 2023-02-09 12:43:20 -05:00
Geoffrey Trousdale 6217b2845e Merged PR 20415: Update Win2D to WinAppSDK 1.0.3
Update Win2D to WinAppSDK 1.0.3
Update Win2D to use HybridCRT
Remove BuildDocs from build process, which isn't intended to be used with WinAppSDK
Disable building of winrt.test.external.uap.vcxproj, which did not run previously because of UAP restrictions in WinAppSDK, but now also does not build because of the move to HybridCRT
Add WinAppSDK as a nuget package dependency, enforcing a minimum version
2022-04-28 15:37:47 +00:00
Ian Blaauw 4d5f43ec1c Merged PR 16988: Fix AnyCPU compilation
Previously the projection project was converted over to not use AnyCPU anymore. This was because there's a bug where the WindowsAppSdk bootstrap dll tries to deploy an AnyCPU version (which doesn't exist) and fails.

Not using AnyCPU causes issues down the line with adding more tests, so this change restores back to using AnyCPU. But it also addresses the bootstrap dll bug more directly, and works around it to deploy x86.
2021-09-08 14:44:56 +00:00
Ian Blaauw 1423fc5aae Merged PR 16895: Update Win2D to Reunion 1.0.0-experimental1
Updates all the package references to upgrade Reunion -> WindowsAppSdk 1.0 experimental.

Some of the tests needed fixes because WindowsAppSdk added a namespace called Microsoft.Windows. Because of the way the tests are using namespaces, all their references to Windows.UI.Foo auto-resolved to Microsoft.Windows.UI.Foo which breaks.
2021-08-27 22:59:47 +00:00
Geoffrey Trousdale 0ad9590fe0 Merged PR 16192: Update Win2D to support Reunion 0.8.0
Updates Win2D to depend on Reunion 0.8.0

Includes some breaking changes:
 - Microsoft.System.DispatcherQueue -> Microsoft.UI.Dispatching.DispatcherQueue
 - Microsoft.Graphics.IGeometrySource2D -> Windows.Graphcis.IGeometrySource2D
2021-06-24 23:01:13 +00:00
Geoffrey Trousdale 394309c7cc Updated Win2D to ProjectReunion.0.5.0
- .Net5 projections added
 - Updated to reflect WinUI3 changes
 - Samples will now live in the Win2D-samples repo
 - CanvasAnimatedControl and CanvasBitmap not yet supported
2021-04-01 09:38:43 -07:00
Shawn Hargreaves d5732edd08 Fix tabs -> spaces 2019-09-06 16:13:10 -07:00
Alexandre Zollinger Chohfi 52f7a0b70c Add ARM64 support (#722)
* Add ARM64 entries where ARM entries are

This change adds ARM64 entries where ARM(32) entries already exist.

In the case of certain test configurations, ARM is set to use the x86
configuration so ARM64 imitates this.

Since winrt.test.managed.uap.csproj is not compatible with .NET Native
and the ARM64 UWP does not support .NET other than Native, it is
omitted.

* Upgrade DirectXTK_UWP dep to 2019.4.26.1

This takes care of unresolved externals in the Direct3DInterop library
by updating to a version of directxtk_uwp that has ARM64 support.

* Bump UniversalWindowsPlatform to 6.2.8

This change fixes the Nuget Restore error
The local source 'C:\Users\jkunkee\source\repos\Win2D\bin' doesn't exist.

Incidentally, it also pulls in a version with official ARM64 support:
https://github.com/Microsoft/dotnet/blob/master/releases/UWP/net-native2.2/README.md#uwp-627-march-12th-2019

* Set TargetPlatformMinVersion to 10.0.16299.0 for ARM64

This change fixes errors about ARM64 not being supported before 16299.

* Work around NuGet TargetPlatformMinVersion limits

This change accomodates Visual Studio's lack of support for multiple
TargetPlatformMinVersion values in one project by separating the NuGet
restore and the build operations that depend on it.

UWAs that intend to support ARM64 must have a TargetPlatformMinVersion
of at least 10.0.16299.0, while UWAs that intend to support all past
versions of Windows 10 must set it to 10.0.10240.0. The Win2D sample
and test UWAs need to do both, but NuGet restore only takes one. This
this change copies the restore and build operations into two such that
the 16299 restore runs, the 16299 (ARM64) builds run, then the 10240
restore runs, and finally the 10240 builds run. This builds
everything, including tests, for all architectures. One side effect is
that the NuGet package state is left in a state that supports building
the most common Platforms from Visual Studio.

A corrolary to this is that exported sample projects will require
similar arrangements to build for both full Windows 10 backwards
compatibility and for ARM64.

Since BuildDocs.proj also uses NuGet Restore, it specifically uses the
more general 10240 restore target.

* Drop WorkAroundNuGetRestoreBug

As of Visual Studio 2017 and this point in the commit history, this
workaround is no longer necessary.
2019-09-06 15:30:24 -07:00
Alexandre Zollinger Chohfi e7c0040e82 Fix build with Visual Studio 2019 (with tests) (#721)
* Use latest installed Windows SDK version

* Use VS2019 (v142) C++ toolchain

* Use UniversalApiContract version in 18362 SDK

* Fix build with VS2019 compiler

* Fix Win2DValidatePlatformVersion when the version is 10.0

In later versions of Visual Studio, this means "the highest
version out of whatever platform SDKs are installed".

* Add VS2019 support to Win2D.proj

* Use explicit SDK version

* Use PlatformToolset from Win2D.Cpp.props

* Update version in solution file header

* Port ShaderCompiler fixes from xaml_islands branch

* Re-add explicit PlatformToolset

* Update code generator to match manual changes

* Update README

* Update build.cmd

* Update TargetPlatformVersion in sample projects

* Silence deprecation warning/error

* Fix double-definition build error

* Fix ambiguous-definition errors

* Tests running on VS 2019.
2019-09-06 14:11:02 -07:00
Shawn Hargreaves db76281437 Disable running test.external from Win2D.proj due to vstest bug, and link vstest workarounds to the bugs that track them 2018-04-17 20:27:35 +00:00
Shawn Hargreaves e0fa5b4848 Work around NuGet restore bug 2018-04-04 15:56:05 -07:00
Shawn Hargreaves d66c561f8f Optionally consume the Windows SDK via NuGet package
This is for internal Microsoft builds that want to consume prerelease SDK versions
2018-03-14 16:30:55 -07:00
Shawn Hargreaves de83a6464b Restore NuGet packages separately for all platforms * configurations
Turns out this is required when consuming new style .csproj NuGet references. The NuGet
restore operation generates temp files into the obj folder, which is unique per config,
so restoring just one config doesn't enable building others.

This change also switches from restoring individual projects to restoring the top level
.sln. We previously avoided that to work around a NuGet bug that is no longer relevant.
Restoring the .sln is simpler and MUCH faster.
2018-03-13 11:28:18 -07:00
Shawn Hargreaves 0890413d73 Update test.managed to MSTest v2 2018-03-09 08:30:21 -08:00
Shawn Hargreaves e3c26282a0 Change project.json to .csproj NuGet references
The UWP C# project system has migrated from project.json to a newer .csproj mechanism for referencing NuGet packages, and newer versions of the commandline nuget.exe no longer support restoring packages from project.json.   This change updates Win2D to match.
2018-03-06 08:19:34 -08:00
Shawn Hargreaves ba8daad256 Remove 8.1 support: assorted other cleanups 2018-02-23 15:25:05 -08:00
Damyan Pepper 7e0654bf57 Merged PR 112: Add check for VS150COMNTOOLS when looking for vstest.console.exe
This is so Win2D can be built on machines that don't have VS2015 installed.
2017-12-18 17:54:03 +00:00
Claire Andrews 0c07456be8 Merged PR 100: Update Win2D to support VS 2017 2017-05-19 19:50:08 +00:00
Shawn Hargreaves 98ad7060ac Revert temporary disable of doc build
This reverts the two commits:

"Still build Intellisense even though main doc build is disabled" (66adb0f22e)

"Temporarily disable building docs, until github #390 is fixed" (13f20335b8)
2016-09-19 08:55:58 -07:00
Shawn Hargreaves 66adb0f22e Still build Intellisense even though main doc build is disabled 2016-08-09 04:37:10 -07:00
Shawn Hargreaves 13f20335b8 Temporarily disable building docs, until github #390 is fixed 2016-08-08 12:49:25 -07:00
Shawn Hargreaves d291b91bbd Convert test.external.uap to use CppUnitTestFramework.Universal
This was previously using the non-universal version of the test framework, which somehow
managed to work ok with VS 2015 Update 1, but is not the right thing and broke with
Update 2.

Also reorganized the directory structure to keep things clear as this test project now
includes some UAP-only app files. test.external is split into Shared, UAP, Windows, and
WindowsPhone sub folders, just like we already did for the samples and test.managed.
2016-03-04 13:40:59 -08:00
Shawn Hargreaves d32d0f78f3 Update the copyright checker tool to also validate common source formatting errors, and rename it from "Copyright" to "CheckCode"
Currently implemented checks:

- Tabs should be spaces
- Missing space after keyword
- Lambda with no parameters should not include ()
- Lambda indentation
2016-01-08 14:30:50 -08:00
Shawn Hargreaves 18055dcfef Suppress Sandcastle false positive warning BHT0001
VS 2015 Update 1 is triggering this warning from our doc build.
We suppress it to keep the output from a successful Win2D build 100% clean.
2015-11-30 15:56:56 -08:00
Claire Andrews 7074eb2b5a Remove workaround requiring a reference to System.Numerics.Vectors. 2015-11-30 15:13:12 -08:00
Damyan Pepper e5f90f8e17 Merge branch 'master' into th2
Conflicts:
	tools/docs/Placeholders.xml
	winrt/docsrc/UapApiDescription.cs
2015-11-03 16:16:45 -08:00
Damyan Pepper 6aff36fe20 Generate documentation from the UWP version of Win2D 2015-11-02 13:46:39 -08:00
Damyan Pepper f1f6c40b40 Add CanvasComposition, for interop with Windows.UI.Composition 2015-10-13 15:15:48 -07:00
Shawn Hargreaves 6109b2f1e7 Restore NuGet packages before building exportsample.csproj 2015-09-17 12:16:18 -07:00
Shawn Hargreaves 4d5f27abac Doc build tools have a standard mechanism for inserting [Experimental], [Win10], and [NoCompositor] tags 2015-08-10 16:09:41 -07:00
Shawn Hargreaves 3979285dea Enable the Direct3DInterop example for UAP 2015-07-29 18:25:31 -07:00
Shawn Hargreaves 21f49bda2b Merge remote-tracking branch 'origin/vs2015rtm'
Conflicts:
	Win2D.uap.sln
	build/nuget/VERSION
	samples/ExampleGallery/BackgroundTask/UAP/ExampleGallery.BackgroundTask.uap.csproj
	samples/ExampleGallery/Shared/BackgroundTaskExample.xaml.cs
	samples/ExampleGallery/Shared/Infrastructure/ExampleDefinition.cs
	winrt/test.managed/Shared/EffectTests.cs
	winrt/test.managed/Shared/PathReceiver.cs
2015-07-27 09:51:09 -07:00
Damyan Pepper abe97787d8 Win2D.proj now detects which command prompt it is being run from
Tidied up build.cmd to not try and override the nuget package name (as this no longer works)
2015-07-24 16:27:04 -07:00
Shawn Hargreaves 44996e4db7 Use nuget.exe to restore project.json files as well as packages.config 2015-07-24 15:09:51 -07:00
Shawn Hargreaves 3ac6a77f35 Add dummy assembly to the UWP NuGet package, to workaround .NET Native compiler bug
If an app does not directly reference any numerics types, the current compiler incorrectly drops
its reference to System.Numerics.Vectors.dll, which breaks the build. Workaround is to always
include a stub assembly that explicitly uses one of the numeric types.
2015-07-24 12:27:10 -07:00
Damyan Pepper 52c8331e60 Added Background Task Example for Windows 8.1 and Windows Phone 8.1
This example shows how a background task can use Win2D to draw images that are saved to disk. These images are then used on the app's live tile.
2015-07-23 17:31:21 -07:00
Damyan Pepper 3dbaf5a020 Added Background Task Example to example gallery
This example shows how a background task can use Win2D to draw images that are saved to disk.  These images are then used on the app's live tile.

Currently only for UAP projects since a bug in VS2013 Update 4 does not allow WinRT components to consume Win2D.
2015-07-02 09:24:03 -07:00
Shawn Hargreaves feab52b106 Fix managed UAP test project, and re-enable running these tests 2015-06-02 15:29:06 -07:00
Shawn Hargreaves f01a6f1763 Add smoke.cmd for quickly building and testing a subset of target flavors
- Windows and UAP, but not Phone
- x64 only, not x86 or ARM
- Debug only, not Release
2015-05-29 15:13:41 -07:00
Shawn Hargreaves 9069c279f1 UAP version of CoreWindowExample 2015-05-28 17:58:42 -07:00
Shawn Hargreaves 63f96e70a0 UAP version of SimpleSample 2015-05-28 17:58:35 -07:00
Shawn Hargreaves b2110c3379 Shorten the per-platform folder names in SimpleSample: SimpleSample\SimpleSample.Windows\ becomes SimpleSample\Windows\
This now matches ExampleGallery and CoreWindowExample.
2015-05-28 17:58:27 -07:00
Damyan Pepper 769230c5e4 Sample exporter
This tool exports the Win2D samples such that they reference the nuget package and can be built in isolation.
2015-05-22 12:12:09 -07:00
Damyan Pepper 406b2ab0e3 Consolidate tests/samples to the samples directory.
SimpleSample now builds alongside the other samples.

Removed CsConsumer
2015-05-22 10:22:15 -07:00
Shawn Hargreaves b8fe814fe7 Fix build issues caused by DirectXTK NuGet package file locking
The way the DirectXTK NuGet packages are built depends on a custom MSBuild extension
task. This DLL gets copied to a temporary location at the start of the build, then
loaded into the MSBuild process. Two problems result:

- The DLL copy fails if multiple processes attempt to build different flavors of the
  same project using the package in parallel. (poor) solution is to disable parallel
  build only for the project that uses DirectXTK.

- As long as MSBuild remains alive, the DLL is locked, so subsequent operations such
  as git clean will fail. Solution is to specify the MSBuild switch (/nr) telling it not to
  keep around process instances for later reuse.
2015-04-24 12:07:11 -07:00
Shawn Hargreaves 12f546b3bd Add Direct3D interop sample to Example Gallery
This uses Win2D to draw scrolling text into a rendertarget, maps that
rendertarget onto a 3D teapot model (which is drawn via DirectXTK),
then uses Win2D image effects to apply a bloom postprocess filter.

Currently only for 8.1 (not UAP) due to lack of UAP NuGet package for DirectXTK.
2015-04-23 21:12:57 -07:00
Damyan Pepper 89cacb9087 re-enable 64-bit UAP tests 2015-04-17 16:12:14 -07:00
Damyan Pepper b36b3f17c3 Win2D.proj now keys off CurrentBuildNumber to determine if it should try and run the UAP tests 2015-04-16 10:03:52 -07:00
Damyan Pepper 238568868c Only try and run UAP tests if the current machine is running Windows 10 2015-04-15 15:39:12 -07:00