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

1539 Коммитов

Автор SHA1 Сообщение Дата
Sergio Pedri 59eda0efb1 Merged PR 32855: Update WASDK release notes to 1.3.0
This PR prepares the WASDK branch for the 1.3.0 release.

----
#### AI description  (iteration 1)
#### PR Classification
Documentation update

#### PR Summary
This pull request updates the release notes and dependencies for the Win2D-WinUI 1.3.0 release.
- Updated `CHANGELOG.md` with release notes for version 1.3.0.
- Updated `WindowsAppSdkVersion` in `build/WindowsAppSdk.common.props` and related package files.
- Updated `winrt.projection.csproj` to version 1.3.0 and lowered `WindowsSdkPackageVersion`.
- Updated `Microsoft.Windows.CSWinRT` version in multiple project files.
- Deleted `build/nuget/VERSION-PRERELEASE`.
2024-10-11 16:04:27 +00:00
Sergio Pedri cc50183ea7 Merged PR 32718: Fix WinAppSDK branch build errors
This PR makes the WASDK branch build again, with the following changes:
- Bump the SDK back up to 22000 (we need this due to us depending on `LoadLibrary`)
- Add missing `WindowsSdkPackageVersion` properties
- Add explicit `WebView2` dependencies to fix errors due to missing .winmd files

----
#### AI description  (iteration 1)
#### PR Classification
Bug fix to resolve build errors in the WinAppSDK branch.

#### PR Summary
This pull request addresses build errors by updating target framework versions and adding necessary package references.
- Updated `TargetFramework` and `WindowsSdkPackageVersion` in multiple project files (`.csproj`, `.vcxproj`, `.props`, `.nuspec`) to `10.0.22000.0`.
- Added `Microsoft.Web.WebView2` package reference in several project files (`.csproj`, `.vcxproj`, `packages.config`).
- Adjusted `TargetDeviceFamily` versions in `Package.appxmanifest` to `10.0.0.0`.
2024-10-08 06:20:33 +00:00
Phil Nachreiner aa64e80e95 Merged PR 32714: Remove PFX file from Win2D to comply with KPI [SFI-ES3.3.1] Exposed Secrets
Win2D has a test UWP that's uses a test certificate for signing.  We can't have PFX's checked in to repos anymore.

This solution generates the PFX on the fly via the same way WinUI Gallery does: https://dev.azure.com/microsoft/WinUI/_git/WinUI-Gallery-Mirror?path=/build/GenerateTestPfx.ps1&version=GBmain

What's changed:
1. Removed TemoporaryKey.pfx.
2. Updated .gitignore to latest version from GitHub so no one accidentally checks in the pfx.
3. Add a script to generate the pfx.
4. Update build pipeline to call script prior to building project.

Note: we probably need to communicate this script needs to be run once in order to do development in Win2D.

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup to comply with security policies by removing exposed secrets.

#### PR Summary
This pull request removes a PFX file from the Win2D project to comply with KPI [SFI-ES3.3.1] regarding exposed secrets.
- `.gitignore`: Updated to include various new patterns and exclude sensitive files like `.pfx`.
- `build/AzurePipelinesTemplates/Win2D-ParallelBuild-Steps.yml`: Added a step to generate a test signing certificate.
- `build/GenerateTestPfx.ps1`: Added a new script to generate a self-signed certificate for testing purposes.
2024-09-30 23:06:19 +00:00
Sergio Pedri 9a4e59bb41 Merged PR 32446: Update NuGet dependencies (and WindowsAppSDK)
This PR bumps all dependencies to the latest stable releases. Includes WASDK 1.6 stable.

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update

#### PR Summary
This pull request updates various NuGet dependencies and adjusts target framework versions.
- `Microsoft.Graphics.Win2D.nuspec`: Updated `Microsoft.WindowsAppSDK` version and adjusted target framework versions.
- `winrt.test.nativecomponent.projection.csproj`: Updated target framework and `Microsoft.Windows.CsWinRT` version.
- `Package.appxmanifest`: Adjusted `MaxVersionTested` for `TargetDeviceFamily`.
- `winrt.test.managed.winappsdk.csproj`: Updated target framework and `Microsoft.Windows.CsWinRT` version.
- `CHANGELOG.md`: Updated to reflect the new `WindowsAppSDK` version.
2024-09-26 23:26:49 +00:00
Sergio Pedri 8303843cfd Merged PR 32674: Port changes from 32669
This PR fixes build errors due to obsolete operators in the test projects.
Port of !32669.

----
#### AI description  (iteration 1)
#### PR Classification
Porting changes from a previous pull request.

#### PR Summary
This pull request ports changes from PR #32669, primarily addressing preprocessor definitions to suppress deprecation warnings.
- Modified `winrt/test.external/winrt.test.external.uap.vcxproj` to add `_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING` to preprocessor definitions.
- Modified `winrt/test.internal/winrt.test.internal.uap.vcxproj` to add `_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING` to preprocessor definitions.
2024-09-26 06:31:36 +00:00
Sergio Pedri 5bfaff37bd Merged PR 32536: Update .NET projections
This PR improves the .NET projections for WinAppSDK:
- Bump CsWinRT and the Windows SDK projections
- Include the XML docs for the projections

----
#### AI description  (iteration 1)
#### PR Classification
Dependency update

#### PR Summary
This pull request updates the .NET projections by upgrading package versions and adding new files for better compatibility and functionality.
- `winrt.projection.csproj`: Updated `WindowsSdkPackageVersion` to `10.0.22000.38` and `Microsoft.Windows.CSWinRT` to `2.1.1`.
- `winrt.test.managed.winappsdk.csproj`: Updated `Microsoft.Windows.CsWinRT` to `2.1.1`.
- `winrt.test.nativecomponent.projection.csproj`: Updated `WindowsSdkPackageVersion` to `10.0.22621.38` and `Microsoft.Windows.CsWinRT` to `2.1.1`.
- `Microsoft.Graphics.Win2D.nuspec`: Added a new file `Microsoft.Graphics.Canvas.Interop.xml` for `net6.0-windows10.0.22621.0`.
2024-09-25 08:21:33 +00:00
Geoffrey Trousdale 40dde2261a Merged PR 32524: Move Win2D.winappsdk to a compliant nuget feed
Rather than pulling directly from nuget.org, the build will now pull from a managed public nuget feed. The new nuget feed still upstreams to nuget.org and caches any package pulled from nuget.org. The major difference in operation is that the first time that a new package or version is pulled from an upstream source, it requires authentication by a Microsoft employee.

----
#### AI description  (iteration 1)
#### PR Classification
Code cleanup to move Win2D.winappsdk to a compliant NuGet feed.

#### PR Summary
This pull request updates the NuGet feed configuration to use a compliant feed for Win2D.winappsdk and refactors related build scripts.
- `build/AzurePipelinesTemplates/Win2D-ParallelBuild-Steps.yml`: Updated NuGet restore and authentication steps, removed redundant configurations.
- `nuget.config`: Replaced old feed with `Win2D-Dependencies` and cleaned up disabled package sources.
- Deleted `build/nuget/azure_pipelines_nuget.config`: Removed obsolete NuGet configuration file.
2024-09-12 23:08:30 +00:00
Sergio Pedri 52ef02a7cf Merged PR 31976: Update dependencies, prepare 1.2.1-experimental2 release
This PR prepares the 1.2.1-experimental2 release:
- Update all SDK projections, CsWinRT dependencies
- Update the changelog
- Bump the version suffix to 'experimental2'

> **NOTE:** keeping WASDK at 1.6-experimental1 due to issues with the WebView2 split, we can do that as a follow up.
2024-08-07 02:30:40 +00:00
Sergio Pedri 264c6e0d75 Merged PR 31830: Merged PR 25872: Remove all Windows 8.1, Windows 10 and Windows Phon...
This PR cherry-picks !25872 into the WinAppSDK branch. Same exact changes, minus resolving merge conflicts.

---

This PR removes all leftover Windows 8.1 and Windows Phone code:
- Assumes `WINVER > _WIN32_WINNT_WINBLUE` is always true and removes all conditions
- Assumes `WINVER >= _WIN32_WINNT_WIN10` is always true and removes all conditions
- Removes all leftover conditions for `USE_LOCALLY_EMULATED_UAP_APIS` (Windows 8.1 only)
- Removes all `WINDOWS_PHONE` conditions as they're always not defined
- Removes a couple of empty files after the changes above
2024-07-24 16:30:15 +00:00
Geoffrey Trousdale b592bb0e8a Merged PR 27700: Reenable CanvasAnimatedControl for WinUI3
Reenable CanvasAnimatedControl for WinUI3.

This mostly involved changing CoreDispatcher over to DispatcherQueue. This has some caveats as the game thread was relying on receiving the Completed event for the IAsyncAction that is returned by CoreDispatcher.RunAsync, but the equivalent DispatcherQueue.TryEnqueue returns void. To work around this, we wrap the callback in an IAsyncAction, which then gets manually called and fires a completion event as part of the Callback that is passed to the DispatcherQueue.

This change also reenables the CanvasAnimatedControl tests (minus a few that did not survive the port to WinUI3) and removes the CANVAS_ANIMATED_CONTROL_IS_ENABLED macro.
2024-07-18 14:50:00 +00:00
Sergio Pedri 67903e71ce Merged PR 31639: Add 'WindowId'-based WinRT APIs for CanvasSwapChain
### Closes https://github.com/microsoft/Win2D/issues/924

### Overview

This PR introduces the following new APIs for `CanvasSwapChain`:
```cpp
[overload("CreateForWindowId")]
HRESULT CreateForWindowIdWithDpi(
    [in] ICanvasResourceCreator* resourceCreator,
    [in] Microsoft.UI.WindowId windowId,
    [in] float width,
    [in] float height,
    [in] float dpi,
    [out, retval] CanvasSwapChain** swapChain);

[overload("CreateForWindowId")]
HRESULT CreateForWindowIdWithAllOptions(
    [in] ICanvasResourceCreator* resourceCreator,
    [in] Microsoft.UI.WindowId windowId,
    [in] float width,
    [in] float height,
    [in] float dpi,
    [in] DIRECTX_PIXEL_FORMAT format,
    [in] INT32 bufferCount,
    [out, retval] CanvasSwapChain** swapChain);
```

> **NOTE:** we can add a simpler overload with no size/DPI in a follow up.
2024-07-11 06:32:28 +00:00
Sergio Pedri 7cb8b06bd9 Merged PR 31596: Merged PR 26188: Add interop APIs to create CanvasSwapChain-s for HWNDs
Merged PR !28442

> Contributes to https://github.com/microsoft/Win2D/issues/915.

This PR adds the following APIs to the interop header:

```cpp
namespace ABI {
    namespace Microsoft {
        namespace Graphics {
            namespace Canvas {

              class __declspec(uuid("040AB731-08F1-469F-9BF9-5B1160F27224"))
                  ICanvasSwapChainFactoryNative : public IInspectable
              {
              public:
                  IFACEMETHOD(CreateForHwnd)(
                      ICanvasResourceCreator* resourceCreator,
                      HWND hwnd,
                      uint32_t width,
                      uint32_t height,
                      float dpi,
                      DirectXPixelFormat format,
                      int32_t bufferCount,
                      ICanvasSwapChain** canvasSwapChain) = 0;
              };
} } } }
```
2024-07-01 21:03:52 +00:00
Geoffrey Trousdale 9ee2831975 Merged PR 31570: Fix version suffix in projection project to be experimental1
Fix version suffix in projection project to be experimental1
2024-06-25 20:49:52 +00:00
Geoffrey Trousdale 070afb59f7 Merged PR 31566: Update changelog for 1.2.1-experimental1
Update changelog for 1.2.1-experimental1
2024-06-25 20:37:22 +00:00
Geoffrey Trousdale e5088a322b Merged PR 31562: Move to OneBranch signing
Move to OneBranch signing
2024-06-25 18:51:06 +00:00
Sergio Pedri a67c0bbb1e Merged PR 31460: Tweak comment to make PoliCheck happy
Fixes:

```
Error : PoliCheck detected dubious verbiage
winrt/lib/utils/ResourceWrapper.h: 'special needs' - // outer_inspectable_t is a typedef so it can be customized by types with special needs (eg. CanvasBitmap).
```

This just made the release CI fail 🤦‍♂️
2024-06-17 15:23:46 +00:00
Geoffrey Trousdale c769cb49fc Merged PR 31448: Change prerelease version to experimental1 to match winappsdk
Change prerelease version to experimental1 to match winappsdk
2024-06-16 12:05:47 +00:00
Geoffrey Trousdale 5989316aba Merged PR 31430: Update WinAppSDK to 1.6.240531000-experimental1
Update WinAppSDK to 1.6.240531000-experimental1 and CsWinRT to 2.1.0-prerelease.240602.1

This change updates TargetPlatformVersion and TargetFramework version from 19041 to 22000. In WinAppSDK, the experimental channel uses 22000 instead of 19041, for reasons related to stripping out experimental APIs. When WinAppSDK 1.6 stable releases, it will drop back to 19041. Win2D will also drop back down to 19041 for the stable release.
2024-06-13 18:26:44 +00:00
Geoffrey Trousdale c3c6538009 Merged PR 30071: Publish symbols to correct ADO org
Publish symbols to our own ADO org instead of OneBranch's ADO org
2024-03-09 15:08:56 +00:00
Geoffrey Trousdale d66ad7e73c Merged PR 30029: Update version and changelog for 1.2.0, update WinAppSDK version to 1.5.240227000
Update version and changelog for 1.2.0

Also bump WinAppSDK version to 1.5.240227000
2024-03-04 19:30:52 +00:00
Geoffrey Trousdale b3600197aa Update WinAppSDK version to 1.5.240227000 2024-03-04 11:03:44 -05:00
Geoffrey Trousdale 67a57da9a6 Update version and changelog for 1.2.0 2024-03-01 16:46:34 -05:00
Geoffrey Trousdale ec960d7948 Merged PR 29959: Allow file:// URIs when loading a font family
Previously only ms-appx and ms-appsdata URIs were allowed when specifying a font family. Since those do not work in unpackaged applications, this change allows file:// URIs to be passed in.
2024-02-27 14:29:27 +00:00
Geoffrey Trousdale c12dfe751d Merged PR 29945: Roll Target Framework Version back to 19041
Win2D updated its TargetPlatformVersion and TargetFrameworkVersion to 22621 ahead of WinAppSDK, which is still at 19041. This meant that any apps using the WinUI3 Visual Studio templates would not build out of the box when adding the Win2D nuget package.

This change rolls back to 19041, which we expect will not break any scenarios for existing customers who have already updated to 22621.
2024-02-26 22:39:24 +00:00
MerlinBot 9329b1ef2c Upgrade NuGetAuthenticate@0 to NuGetAuthenticate@1
Update your YAML NuGetAuthenticate@0 references by 1/31/2024 **by completing this PR**.

## Why
The Azure DevOps team will remove the NuGetAuthenticate@0 task in Azure DevOps Marketplace after January 31st, 2024. This task is used to authenticate with NuGet feeds in Azure Artifacts or other external sources.
If you use this task in any Azure DevOps YAML pipelines, you will need to update it to NuGetAuthenticate@1. This deprecation applies to all Azure DevOps Pipelines and is not specific to your org.
Failure to update these references could result in pipeline instability and interruption to your team's productivity.

**Action Required**: Please review the changes in this PR and merge it to your default branch. If you have other active branches (such as release branches) that use the old task, you will need to cherry-pick this change to update them as well.

---

For feedback or questions about this PR, please find the contact information in the above description. If none exists, please contact the [Gardener team](mailto:gardener@microsoft.com) to help route.

---

This change was automatically generated by [1ES Gardener](https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/gardener/1es-gardener) (a [MerlinBot](https://aka.ms/MerlinBot) extension) which is an initiative by the 1ES team to help repos stay up-to-date with latest tools, features, and best practices.
2024-02-20 21:43:16 +00:00
Geoffrey Trousdale 8e6467c5be Merged PR 29800: Unblock pipeline build breaks
A misnamed PAT and an expiring tool were blocking pipeline builds. The expiring tool warning came from OneBranch updating our tools, and it has been suppressed for now, but need to be fixed before it is no longer supported.
2024-02-17 15:02:06 +00:00
Geoffrey Trousdale 6710fb3204 Trying to suppress build failures 2024-02-14 15:51:29 -05:00
Geoffrey Trousdale 1518dc8ffa Fix nuget authentication using service connections 2024-02-14 15:32:37 -05:00
Geoffrey Trousdale 53b953b614 Merged PR 28598: Remove .NET Core 3 support and update 1.1.1 changelog
Remove .NET Core 3 support and update 1.1.1 changelog
2023-11-20 20:35:06 +00:00
Sergio Pedri 95ce22e9fc Merged PR 28594: Fix outdated TFM check from bundled .targets
This PR fixes the TFM check in the bundled .targets file.
We should also cherry-pick this to the UWP branch later.
2023-11-20 16:51:33 +00:00
Geoffrey Trousdale 6a0b3920ab Merged PR 28565: Change version to 1.1.1 and update changelog
Change version to 1.1.1 and update changelog
2023-11-17 14:58:25 +00:00
Sergio Pedri 219f92f122 Merged PR 28564: Bump WinAppSDK to 1.4.231115000
This PR just bumps WinAppSDK to 1.4.231115000 (latest stable).
2023-11-17 14:36:43 +00:00
Sergio Pedri fb3933ac09 Merged PR 28468: Bump WinAppSDK to 1.4.231008000 and CsWinRT to 2.0.4
This PR bumps the following deps:
- WinAppSDK to 1.4.231008000
- Windows SDK to 10.0.22621.31
- CsWinRT to 2.0.4

> **NOTE**: all of these updates are to patch versions (no major/minor version changes)
2023-11-16 16:40:24 +00:00
Geoffrey Trousdale 34717480a9 Merged PR 28443: Move Win2D to OneBranch pipelines
Introduces two new Win2D build scripts:
 - Win2D-Buddy
   - Used for continuous integration pipeline and pull requests
 - Win2D-Official
   - Used for official releases, includes code signing

For now, the nightly pipeline has been removed, and will be re-added later.
2023-11-16 14:50:01 +00:00
Sergio Pedri 39d02dd321 Merged PR 28451: Fix package TFMs for .NET projections
This PR fixes the TFMs for the .NET projections in the NuGet package. We're using 22621 as target TFM, and 17763 as minimum, so the folder for the .NET projections should use the `-windows10.0.22621` TPM.

### Package structure

![image.png](https://mscodehub.visualstudio.com/8b1f3307-e83a-4982-b590-048338090061/_apis/git/repositories/dc534cf5-25c9-4f57-83b0-7a52fa2a046d/pullRequests/28451/attachments/image.png)
2023-11-13 18:54:32 +00:00
Sergio Pedri 3dcfe19217 Merged PR 27972: Use non-generic RIDs to pack native libraries
This PR switches the native libraries to be packed with non-generic RID folders.
Doing so fixes Win2D failing to load (class not registered errors) when using .NET 8.
See https://github.com/microsoft/Win2D/issues/935 for more details.

### Screenshots

![image.png](https://mscodehub.visualstudio.com/8b1f3307-e83a-4982-b590-048338090061/_apis/git/repositories/dc534cf5-25c9-4f57-83b0-7a52fa2a046d/pullRequests/27972/attachments/image.png)
2023-11-10 21:21:26 +00:00
Sergio Pedri 2cda78a380 Merged PR 28442: Merged PR 28335: Fix includes in published header
Merged PR !28335.

This PR includes a few fixes to the published interop header:
- Adds the include for `d2d1_1.h`, which fixes build errors for C++ consumers (D2D types were missing)
- Removes the unnecessary D2D interface forward declaration (we just have the include now)
- Remove the unnecessary WRL include (it should only be included for C++/CX consumers)
  - It was already included below, it was just accidentally duplicated at the top as well
2023-11-10 19:42:25 +00:00
Sergio Pedri 04f9fc4552 Merged PR 27722: Bump WinAppSDK to 1.4.230913002
This PR just bumps WinAppSDK to 1.4.230913002 (1.4.1), which was just released.
No CsWinRT update is available (2.0.3 is still the latest), so we just need to bump WinAppSDK.
2023-09-26 15:42:50 +00:00
Geoffrey Trousdale db4bac7d69 Merged PR 27143: Update Changelog and version numbers for 1.1.0
Update Changelog and version numbers for 1.1.0
2023-09-15 17:55:37 +00:00
Sergio Pedri bf38bbe336 Merged PR 27397: Bump WinAppSDK to 1.4.230822000
This PR bumps WinAppSDK to 1.4.230822000
2023-09-13 17:55:17 +00:00
Geoffrey Trousdale 871fd2e386 Merged PR 26884: Add linker options to make symbols readable by ApiScan
Add linker options to make symbols readable by ApiScan
2023-08-14 18:42:49 +00:00
Geoffrey Trousdale 6e5c1b7013 Merged PR 27135: Consolidate all flavors of symbol publishing into the nupkg building task
Consolidate all flavors of symbol publishing into the nupkg building task
2023-08-14 16:31:30 +00:00
Sergio Pedri 5dc256c889 Merged PR 26925: Bump WinAppSDK and CsWinRT to latest stable
This PR bumps WinAppSDK and CsWinRT to latest stable. Since the public release for the next Win2D version is taking a bit longer, might as well update all dependencies we have before shipping, so we're all up to date 😄
2023-07-28 15:50:05 +00:00
Geoffrey Trousdale f1b4b0b013 Update changelog and version to 1.1.0-preview2 2023-05-25 18:45:28 -04:00
Geoffrey Trousdale ebbd47634f Merge https://github.com/microsoft/Win2D into winappsdk/main 2023-05-25 18:42:36 -04:00
Geoffrey Trousdale d288cb1ab5 Merged PR 25602: Enable font loading from file:// URIs
This change allows CanvasFontSets to be loaded from file:// URIs. This works around the problem where the previous implementation did not work in unpackaged applications.
2023-05-25 19:02:27 +00:00
getrou e63db04e35
Merge pull request #916 from kmgallahan/patch-1
Update CHANGELOG.md
2023-05-03 13:47:48 -07:00
Sergio Pedri 10c45df98f Merged PR 25599: Cherry-pick 25566: Minor tweaks from external testing
This PR cherry-picks !25566 on the WASDK branch.
2023-04-27 13:31:45 +00:00
Kevin Gallahan 28e13bdc46
Update CHANGELOG.md
- Add missing bullets
- Add line spacing before lists
2023-04-21 07:12:40 -04:00
Geoffrey Trousdale 09b6ca5e47 Merge https://github.com/microsoft/Win2D into winappsdk/main 2023-04-20 13:32:02 -04:00