From e200bdc712f6ab15d6b0f76551601fcd051a7ea6 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Fri, 7 Oct 2022 13:45:13 -0400
Subject: [PATCH 01/11] Updated nuget packages
---
src/Authoring/WinRT.Host/WinRT.Host.vcxproj | 10 +++++-----
src/Authoring/WinRT.Host/WinRT.Host.vcxproj.filters | 2 +-
src/Authoring/WinRT.Host/packages.config | 2 +-
.../AuthoringConsumptionTest.vcxproj | 8 ++++----
src/Tests/AuthoringConsumptionTest/packages.config | 3 +--
src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj | 9 ++++-----
src/Tests/CSWinMDComponent/packages.config | 2 +-
.../TestComponentCSharp/TestComponentCSharp.vcxproj | 8 ++++----
src/Tests/TestComponentCSharp/packages.config | 2 +-
9 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj
index 2dd3c14d0..26ee752fc 100644
--- a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj
+++ b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj
@@ -1,6 +1,6 @@
-
+
Debug
@@ -39,7 +39,7 @@
v143
v142
Unicode
-
+
true
@@ -285,14 +285,14 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj.filters b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj.filters
index 929bfabcf..ce8315a10 100644
--- a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj.filters
+++ b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj.filters
@@ -46,8 +46,8 @@
Source Files
-
+
diff --git a/src/Authoring/WinRT.Host/packages.config b/src/Authoring/WinRT.Host/packages.config
index 81f107b8b..48319b8c9 100644
--- a/src/Authoring/WinRT.Host/packages.config
+++ b/src/Authoring/WinRT.Host/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
index ccaec547b..9e9b6fd8f 100644
--- a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
+++ b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
@@ -2,7 +2,7 @@
-
+
Debug
@@ -103,7 +103,7 @@
-
+
@@ -206,8 +206,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/Tests/AuthoringConsumptionTest/packages.config b/src/Tests/AuthoringConsumptionTest/packages.config
index 2060e266c..0e113de58 100644
--- a/src/Tests/AuthoringConsumptionTest/packages.config
+++ b/src/Tests/AuthoringConsumptionTest/packages.config
@@ -1,8 +1,7 @@
-
-
+
\ No newline at end of file
diff --git a/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj b/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
index 2526d7391..c097606af 100644
--- a/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
+++ b/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
@@ -1,6 +1,6 @@
-
+
true
true
@@ -148,14 +148,13 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/CSWinMDComponent/packages.config b/src/Tests/CSWinMDComponent/packages.config
index 43182aa87..1cf4290e1 100644
--- a/src/Tests/CSWinMDComponent/packages.config
+++ b/src/Tests/CSWinMDComponent/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
index 8f6a8028d..b04f197e2 100644
--- a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
+++ b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
@@ -2,7 +2,7 @@
-
+
high
true
@@ -125,7 +125,7 @@
-
+
@@ -133,8 +133,8 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
diff --git a/src/Tests/TestComponentCSharp/packages.config b/src/Tests/TestComponentCSharp/packages.config
index f1bb47ee8..76477fbb4 100644
--- a/src/Tests/TestComponentCSharp/packages.config
+++ b/src/Tests/TestComponentCSharp/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
From 2fdc74edff5dc9c39eb37fe65bd27b33768d5fc9 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Fri, 7 Oct 2022 13:53:59 -0400
Subject: [PATCH 02/11] Update and consolidate other nuget packages
---
.../WinRT.SourceGenerator.csproj | 4 ++--
src/Authoring/cswinmd/CsWinMD.csproj | 4 ++--
src/Benchmarks/Benchmarks.csproj | 8 ++++----
.../WinUIDesktopSample/WinUIDesktopSample.csproj | 2 +-
.../AuthoringWinUITest/AuthoringWinUITest.vcxproj | 12 ++++++------
.../AuthoringWinUITest/packages.config | 4 ++--
src/Tests/DiagnosticTests/DiagnosticTests.csproj | 10 +++++-----
src/Tests/HostTest/HostTest.vcxproj | 12 ++++++------
src/Tests/HostTest/packages.config | 2 +-
src/Tests/UnitTest/UnitTest.csproj | 14 +++++++-------
src/WinRT.Runtime/WinRT.Runtime.csproj | 4 ++--
src/cswinrt/cswinrt.vcxproj | 4 ++--
src/cswinrt/packages.config | 2 +-
13 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj b/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj
index dd02d9c1e..9839ab6f1 100644
--- a/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj
+++ b/src/Authoring/WinRT.SourceGenerator/WinRT.SourceGenerator.csproj
@@ -18,8 +18,8 @@
-
-
+
+
diff --git a/src/Authoring/cswinmd/CsWinMD.csproj b/src/Authoring/cswinmd/CsWinMD.csproj
index bc34bfbe1..69bc450ad 100644
--- a/src/Authoring/cswinmd/CsWinMD.csproj
+++ b/src/Authoring/cswinmd/CsWinMD.csproj
@@ -23,8 +23,8 @@
-
-
+
+
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
index bf67fec8d..2e7c5aa08 100644
--- a/src/Benchmarks/Benchmarks.csproj
+++ b/src/Benchmarks/Benchmarks.csproj
@@ -17,10 +17,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/Samples/WinUIDesktopSample/WinUIDesktopSample.csproj b/src/Samples/WinUIDesktopSample/WinUIDesktopSample.csproj
index 037178e62..1bf46201e 100644
--- a/src/Samples/WinUIDesktopSample/WinUIDesktopSample.csproj
+++ b/src/Samples/WinUIDesktopSample/WinUIDesktopSample.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/src/cswinrt/cswinrt.vcxproj b/src/cswinrt/cswinrt.vcxproj
index 674c12582..408286080 100644
--- a/src/cswinrt/cswinrt.vcxproj
+++ b/src/cswinrt/cswinrt.vcxproj
@@ -1,7 +1,7 @@
+
-
15.0
{6acfd2b2-e8aa-4cd4-aad8-213ce8bb2637}
@@ -125,8 +125,8 @@
This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.
-
+
\ No newline at end of file
diff --git a/src/cswinrt/packages.config b/src/cswinrt/packages.config
index 293ccb4f7..6e5bd112e 100644
--- a/src/cswinrt/packages.config
+++ b/src/cswinrt/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
From bf6bc3028a45ee7f6d8bdcb68731d371e7f7ca92 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Fri, 7 Oct 2022 13:56:17 -0400
Subject: [PATCH 03/11] Update Benchmarks.csproj
---
src/Benchmarks/Benchmarks.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
index 2e7c5aa08..2e52f1408 100644
--- a/src/Benchmarks/Benchmarks.csproj
+++ b/src/Benchmarks/Benchmarks.csproj
@@ -19,7 +19,7 @@
-
+
From 1368bbafd876031effd24adec9812cf73e11cd5e Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Fri, 7 Oct 2022 13:59:53 -0400
Subject: [PATCH 04/11] Fix configs
---
src/WinRT.Runtime/GuidGenerator.cs | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/WinRT.Runtime/GuidGenerator.cs b/src/WinRT.Runtime/GuidGenerator.cs
index 2028abe82..128de43bf 100644
--- a/src/WinRT.Runtime/GuidGenerator.cs
+++ b/src/WinRT.Runtime/GuidGenerator.cs
@@ -22,7 +22,7 @@ public static Guid GetGUID(Type type)
return type.GetGuidType().GUID;
}
- public static Guid GetIID(
+ public static Guid GetIID(
#if NET
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
#endif
@@ -36,21 +36,21 @@ public static Guid GetIID(
return (Guid)type.GetField("PIID").GetValue(null);
}
- public static string GetSignature(
+ public static string GetSignature(
#if NET
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
#endif
Type type)
- {
+ {
if (type == typeof(object))
{
return "cinterface(IInspectable)";
- }
-
+ }
+
if (type == typeof(string))
{
return "string";
- }
+ }
var helperType = type.FindHelperType();
if (helperType != null)
@@ -95,15 +95,15 @@ public static string GetSignature(
}
}
}
-
+
type = type.IsInterface ? (type.GetAuthoringMetadataType() ?? type) : type;
if (type.IsGenericType)
{
var args = type.GetGenericArguments().Select(t => GetSignature(t));
return "pinterface({" + GetGUID(type) + "};" + String.Join(";", args) + ")";
- }
-
+ }
+
if (type.IsDelegate())
{
return "delegate({" + GetGUID(type) + "})";
From fa79bb4b6175827409c44d0c068d6efcc7686869 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Sat, 8 Oct 2022 11:00:08 -0400
Subject: [PATCH 05/11] Update nuget
---
CONTRIBUTING.md | 2 +-
src/Samples/TestEmbedded/build.cmd | 2 +-
src/build.cmd | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2e7cc2173..ca81d5ec7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ C#/WinRT currently requires the following packages, or newer, to build:
- [Visual Studio 17.0](https://visualstudio.microsoft.com/downloads/)
- [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
- [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1)
-- [nuget.exe 5.8.0-preview.3](https://www.nuget.org/downloads)
+- [nuget.exe 6.3.0](https://www.nuget.org/downloads)
- Microsoft.WinUI 3.0.0-preview4.210210.4
- Microsoft.WindowsAppSDK 1.1.5
diff --git a/src/Samples/TestEmbedded/build.cmd b/src/Samples/TestEmbedded/build.cmd
index 87520aed5..e8b2a9cf1 100644
--- a/src/Samples/TestEmbedded/build.cmd
+++ b/src/Samples/TestEmbedded/build.cmd
@@ -22,7 +22,7 @@ if exist %nuget_dir%\nuget.exe (
)
)
if not exist %nuget_dir% md %nuget_dir%
-if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v5.8.0-preview.2/nuget.exe -OutFile %nuget_dir%\nuget.exe"
+if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.3.0/nuget.exe -OutFile %nuget_dir%\nuget.exe"
%nuget_dir%\nuget update -self
call :exec %nuget_dir%\nuget.exe restore %nuget_params% %this_dir%TestEmbedded.sln
diff --git a/src/build.cmd b/src/build.cmd
index 30ab2e56c..9d5c44b72 100644
--- a/src/build.cmd
+++ b/src/build.cmd
@@ -134,7 +134,7 @@ if exist %nuget_dir%\nuget.exe (
)
)
if not exist %nuget_dir% md %nuget_dir%
-if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v5.8.0-preview.2/nuget.exe -OutFile %nuget_dir%\nuget.exe"
+if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.3.0/nuget.exe -OutFile %nuget_dir%\nuget.exe"
%nuget_dir%\nuget update -self
rem Note: packages.config-based (vcxproj) projects do not support msbuild /t:restore
call %this_dir%get_testwinrt.cmd
From 7954327b3c89786c561465c2f818855d3d8793c7 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Thu, 20 Oct 2022 11:52:16 -0400
Subject: [PATCH 06/11] Update README.md
---
src/Samples/NetProjectionSample/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Samples/NetProjectionSample/README.md b/src/Samples/NetProjectionSample/README.md
index 9ecb94551..095759709 100644
--- a/src/Samples/NetProjectionSample/README.md
+++ b/src/Samples/NetProjectionSample/README.md
@@ -10,7 +10,7 @@ This sample demonstrates how to do the following:
* [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) with the Universal Windows Platform development workload installed. In **Installation Details** > **Universal Windows Platform development**, check the **C++ (v14x) Universal Windows Platform tools** option.
* [.NET 6 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
-* nuget.exe 5.8.0-preview.2 or later (for command line MSBuild)
+* nuget.exe 6.3.0 or later (for command line MSBuild)
**Note**: This sample uses .NET 6 and therefore requires Visual Studio 2022 to build and run. If you prefer, you can use Visual Studio 2019 and modify the sample to target [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0). To do this, you will need to modify the `TargetFramework` and the *nuspec* file in the `SimpleMathProjection` project to target `net5.0-windows10.0.19041.0`.
From 5d5bf0106d55e539be303b194591ee5113b562cd Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:01:31 -0400
Subject: [PATCH 07/11] Correct Guid Generator
Undo any accidental changes
---
src/WinRT.Runtime/GuidGenerator.cs | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/WinRT.Runtime/GuidGenerator.cs b/src/WinRT.Runtime/GuidGenerator.cs
index 128de43bf..2028abe82 100644
--- a/src/WinRT.Runtime/GuidGenerator.cs
+++ b/src/WinRT.Runtime/GuidGenerator.cs
@@ -22,7 +22,7 @@ public static Guid GetGUID(Type type)
return type.GetGuidType().GUID;
}
- public static Guid GetIID(
+ public static Guid GetIID(
#if NET
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
#endif
@@ -36,21 +36,21 @@ public static Guid GetIID(
return (Guid)type.GetField("PIID").GetValue(null);
}
- public static string GetSignature(
+ public static string GetSignature(
#if NET
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)]
#endif
Type type)
- {
+ {
if (type == typeof(object))
{
return "cinterface(IInspectable)";
- }
-
+ }
+
if (type == typeof(string))
{
return "string";
- }
+ }
var helperType = type.FindHelperType();
if (helperType != null)
@@ -95,15 +95,15 @@ public static string GetSignature(
}
}
}
-
+
type = type.IsInterface ? (type.GetAuthoringMetadataType() ?? type) : type;
if (type.IsGenericType)
{
var args = type.GetGenericArguments().Select(t => GetSignature(t));
return "pinterface({" + GetGUID(type) + "};" + String.Join(";", args) + ")";
- }
-
+ }
+
if (type.IsDelegate())
{
return "delegate({" + GetGUID(type) + "})";
From aca686af8d62398331b00de72bf896c910586d32 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Wed, 26 Oct 2022 13:58:35 -0400
Subject: [PATCH 08/11] Update the Test Component packages
---
CONTRIBUTING.md | 20 ++++++++--------
src/Samples/NetProjectionSample/README.md | 4 ++--
.../AuthoringConsumptionTest.vcxproj | 8 +++----
.../AuthoringConsumptionTest/packages.config | 2 +-
.../AuthoringWinUITest (Package).wapproj | 2 +-
.../AuthoringWinUITest.vcxproj | 8 +++----
.../AuthoringWinUITest/packages.config | 2 +-
src/Tests/HostTest/HostTest.vcxproj | 8 +++----
src/Tests/HostTest/packages.config | 4 ++--
.../TestComponentCSharp.vcxproj | 8 +++----
src/Tests/TestComponentCSharp/packages.config | 2 +-
src/build.cmd | 24 +++++++++----------
12 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ca81d5ec7..2a90e2aad 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,29 +1,29 @@
# C#/WinRT Contributor's Guide
-Below is our guidance for how to build the repo, report issues, propose new features, and submit contributions via Pull Requests (PRs).
+Below is our guidance for how to build the repo, report issues, propose new features, and submit contributions via Pull Requests (PRs).
## Building the C#/WinRT repo
C#/WinRT currently requires the following packages, or newer, to build:
-- [Visual Studio 17.0](https://visualstudio.microsoft.com/downloads/)
-- [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
+- [Visual Studio 17.0](https://visualstudio.microsoft.com/downloads/)
+- [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
- [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download/dotnet-core/3.1)
-- [nuget.exe 6.3.0](https://www.nuget.org/downloads)
+- [nuget.exe 6.3.1](https://www.nuget.org/downloads)
- Microsoft.WinUI 3.0.0-preview4.210210.4
- Microsoft.WindowsAppSDK 1.1.5
-The [`build.cmd`](src/build.cmd) script takes care of all related configuration steps and is the simplest way to get started building C#/WinRT. It installs prerequisites such as `nuget.exe` and the .NET 6 SDK, configures the environment to use .NET 6 (creating a `global.json` if necessary), builds the compiler, and builds and executes the unit tests. To build C#/WinRT, follow these steps:
+The [`build.cmd`](src/build.cmd) script takes care of all related configuration steps and is the simplest way to get started building C#/WinRT. It installs prerequisites such as `nuget.exe` and the .NET 6 SDK, configures the environment to use .NET 6 (creating a `global.json` if necessary), builds the compiler, and builds and executes the unit tests. To build C#/WinRT, follow these steps:
- Open a Visual Studio Developer command prompt pointing at the repo.
-- Run `src\build.cmd`.
+- Run `src\build.cmd`.
- To launch the project in Visual Studio, run `devenv src\cswinrt.sln` from the same command prompt. This will inherit the necessary environment.
**Note:** By default, the projects for various [Projections](src/Projections) only generate source files for Release configurations, where `cswinrt.exe` can execute in seconds. To generate sources for the [Projections](src/Projections) projects on Debug configurations, set the project property `GenerateTestProjection` to `true`. This configuration permits a faster inner loop in Visual Studio. In either case, existing projection sources under the "Generated Files" folder will still be compiled into the projection assembly.
### Customizing `build.cmd` options
-There are several settings that can be set with `build.cmd` that you might not know about without studying the code. The build settings and defaults are as follows.
+There are several settings that can be set with `build.cmd` that you might not know about without studying the code. The build settings and defaults are as follows.
```cmd
build.cmd [Platform] [Configuration] [VersionNumber] [VersionString] [AssemblyVersion]
@@ -32,7 +32,7 @@ build.cmd [Platform] [Configuration] [VersionNumber] [VersionString] [AssemblyVe
| Parameter | Value(s) |
|-|-|
| Platform | *x64 \| x86 | Default is `x64`
-| Configuration | *Release \| Debug |
+| Configuration | *Release \| Debug |
| VersionNumber | *0.0.0.0 |
| VersionString | *0.0.0-private.0 |
| AssemblyVersion | *0.0.0.0 |
@@ -52,7 +52,7 @@ build.cmd [Platform] [Configuration] [VersionNumber] [VersionString] [AssemblyVe
```cmd
build.cmd x64 Debug 2.0.0.0 2.0.0-mycswinrt.0 2.0.0.0
```
- This is useful if you want to quickly confirm that your private .nupkg is being used by checking the `WinRT.Runtime` assembly version.
+ This is useful if you want to quickly confirm that your private .nupkg is being used by checking the `WinRT.Runtime` assembly version.
## Before you start, file an issue
@@ -117,4 +117,4 @@ Once your code has been reviewed and approved by the requisite number of team me
## Thank you
-Thank you in advance for your contribution!
+Thank you in advance for your contribution!
diff --git a/src/Samples/NetProjectionSample/README.md b/src/Samples/NetProjectionSample/README.md
index 095759709..83e1457a0 100644
--- a/src/Samples/NetProjectionSample/README.md
+++ b/src/Samples/NetProjectionSample/README.md
@@ -10,7 +10,7 @@ This sample demonstrates how to do the following:
* [Visual Studio 2022](https://visualstudio.microsoft.com/downloads/) with the Universal Windows Platform development workload installed. In **Installation Details** > **Universal Windows Platform development**, check the **C++ (v14x) Universal Windows Platform tools** option.
* [.NET 6 SDK](https://dotnet.microsoft.com/download/dotnet/6.0)
-* nuget.exe 6.3.0 or later (for command line MSBuild)
+* nuget.exe 6.3.1 or later (for command line MSBuild)
**Note**: This sample uses .NET 6 and therefore requires Visual Studio 2022 to build and run. If you prefer, you can use Visual Studio 2019 and modify the sample to target [.NET 5](https://dotnet.microsoft.com/download/dotnet/5.0). To do this, you will need to modify the `TargetFramework` and the *nuspec* file in the `SimpleMathProjection` project to target `net5.0-windows10.0.19041.0`.
@@ -19,7 +19,7 @@ This sample demonstrates how to do the following:
For building in Visual Studio:
1. Open *CppWinRTComponentProjectionSample.sln* in Visual Studio. Ensure that *SimpleMathProjection* is set as the startup project, and set the Platform and Configuration to x64 and Release. Right click on the solution and build. This will do the following:
- - Build *SimpleMathComponent*: this will generate *SimpleMathComponent.winmd* and *SimpleMathComponent.dll*
+ - Build *SimpleMathComponent*: this will generate *SimpleMathComponent.winmd* and *SimpleMathComponent.dll*
- Generate the projection interop assembly for the component using C#/WinRT, *SimpleMathProjection.dll*
- Generate a NuGet package for the component. To ensure the solution has built successfully, navigate to the *SimpleMathProjection/nuget* folder in your file explorer. You should see the generated NuGet package (*SimpleMathComponent.0.1.0-prerelease.nupkg*). which can be referenced by C# .NET app consumers.
diff --git a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
index 9e9b6fd8f..ec838b343 100644
--- a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
+++ b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
@@ -1,7 +1,7 @@
+
-
@@ -106,8 +106,8 @@
-
+
@@ -210,9 +210,9 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringConsumptionTest/packages.config b/src/Tests/AuthoringConsumptionTest/packages.config
index 0e113de58..a0aeee0c9 100644
--- a/src/Tests/AuthoringConsumptionTest/packages.config
+++ b/src/Tests/AuthoringConsumptionTest/packages.config
@@ -2,6 +2,6 @@
-
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj b/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj
index 1e18564f8..1901b4e1e 100644
--- a/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj
+++ b/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj
@@ -85,7 +85,7 @@
build
-
+
build
diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj
index 8d3f9caa0..a0bd063bd 100644
--- a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj
+++ b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj
@@ -1,7 +1,7 @@
+
-
true
@@ -172,8 +172,8 @@
-
+
@@ -182,9 +182,9 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config
index 0e113de58..a0aeee0c9 100644
--- a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config
+++ b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config
@@ -2,6 +2,6 @@
-
+
\ No newline at end of file
diff --git a/src/Tests/HostTest/HostTest.vcxproj b/src/Tests/HostTest/HostTest.vcxproj
index 8ce609bb6..4f1c62f45 100644
--- a/src/Tests/HostTest/HostTest.vcxproj
+++ b/src/Tests/HostTest/HostTest.vcxproj
@@ -1,7 +1,7 @@
+
-
@@ -228,8 +228,8 @@
-
+
@@ -331,9 +331,9 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/HostTest/packages.config b/src/Tests/HostTest/packages.config
index 67c770cf2..c7fb8bd5b 100644
--- a/src/Tests/HostTest/packages.config
+++ b/src/Tests/HostTest/packages.config
@@ -1,7 +1,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
index b04f197e2..3c8d5a650 100644
--- a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
+++ b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
@@ -1,7 +1,7 @@
+
-
high
@@ -126,8 +126,8 @@
-
+
@@ -135,9 +135,9 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/TestComponentCSharp/packages.config b/src/Tests/TestComponentCSharp/packages.config
index 76477fbb4..0236b5b99 100644
--- a/src/Tests/TestComponentCSharp/packages.config
+++ b/src/Tests/TestComponentCSharp/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/build.cmd b/src/build.cmd
index 9d5c44b72..330796b6c 100644
--- a/src/build.cmd
+++ b/src/build.cmd
@@ -100,17 +100,17 @@ echo ^ >> %prerelease_targets%
echo ^ >> %prerelease_targets%
goto :skip_build_tools
-rem VS 16.X BuildTools support (when a prerelease VS is required, until it is deployed to Azure Devops agents)
+rem VS 16.X BuildTools support (when a prerelease VS is required, until it is deployed to Azure Devops agents)
msbuild -ver | findstr 16.X >nul
if ErrorLevel 1 (
- echo Using VS Build Tools 16.X
+ echo Using VS Build Tools 16.X
if %cswinrt_platform%==x86 (
set msbuild_path="%this_dir%.buildtools\MSBuild\Current\Bin\\"
) else (
set msbuild_path="%this_dir%.buildtools\MSBuild\Current\Bin\amd64\\"
)
if not exist !msbuild_path! (
- if not exist .buildtools md .buildtools
+ if not exist .buildtools md .buildtools
powershell -NoProfile -ExecutionPolicy unrestricted -File .\get_buildtools.ps1
)
set nuget_params=-MSBuildPath !msbuild_path!
@@ -125,7 +125,7 @@ set nuget_dir=%this_dir%.nuget
if not "%cswinrt_label%"=="" goto %cswinrt_label%
:restore
-rem When a preview nuget is required, update -self doesn't work, so manually update
+rem When a preview nuget is required, update -self doesn't work, so manually update
if exist %nuget_dir%\nuget.exe (
%nuget_dir%\nuget.exe | findstr 5.9 >nul
if ErrorLevel 1 (
@@ -134,7 +134,7 @@ if exist %nuget_dir%\nuget.exe (
)
)
if not exist %nuget_dir% md %nuget_dir%
-if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.3.0/nuget.exe -OutFile %nuget_dir%\nuget.exe"
+if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.3.1/nuget.exe -OutFile %nuget_dir%\nuget.exe"
%nuget_dir%\nuget update -self
rem Note: packages.config-based (vcxproj) projects do not support msbuild /t:restore
call %this_dir%get_testwinrt.cmd
@@ -146,7 +146,7 @@ call :exec %msbuild_path%msbuild.exe %this_dir%\Tests\ObjectLifetimeTests\Object
:build
echo Building cswinrt for %cswinrt_platform% %cswinrt_configuration%
-call :exec %msbuild_path%msbuild.exe %cswinrt_build_params% /p:platform=%cswinrt_platform%;configuration=%cswinrt_configuration%;VersionNumber=%cswinrt_version_number%;VersionString=%cswinrt_version_string%;AssemblyVersionNumber=%cswinrt_assembly_version%;GenerateTestProjection=true;BaselineAllAPICompatError=%cswinrt_baseline_breaking_compat_errors%;BaselineAllMatchingRefApiCompatError=%cswinrt_baseline_assembly_version_compat_errors% %this_dir%cswinrt.sln
+call :exec %msbuild_path%msbuild.exe %cswinrt_build_params% /p:platform=%cswinrt_platform%;configuration=%cswinrt_configuration%;VersionNumber=%cswinrt_version_number%;VersionString=%cswinrt_version_string%;AssemblyVersionNumber=%cswinrt_assembly_version%;GenerateTestProjection=true;BaselineAllAPICompatError=%cswinrt_baseline_breaking_compat_errors%;BaselineAllMatchingRefApiCompatError=%cswinrt_baseline_assembly_version_compat_errors% %this_dir%cswinrt.sln
if ErrorLevel 1 (
echo.
echo ERROR: Build failed
@@ -196,7 +196,7 @@ if not exist %dotnet_exe% (
)
:embeddedtests
-:: build the embedded sample and run the unittest
+:: build the embedded sample and run the unittest
call :exec %dotnet_exe% test --verbosity normal --no-build --logger xunit;LogFilePath=%~dp0embedunittest_%cswinrt_version_string%.xml %this_dir%Samples/TestEmbedded/UnitTestEmbedded/UnitTestEmbedded.csproj /nologo /m /p:platform=%cswinrt_platform%;configuration=%cswinrt_configuration% -- RunConfiguration.TreatNoTestsAsError=true
if ErrorLevel 1 (
echo.
@@ -208,7 +208,7 @@ if ErrorLevel 1 (
rem Running Object Lifetime Unit Tests
echo Running object lifetime tests for %cswinrt_platform% %cswinrt_configuration%
if '%NUGET_PACKAGES%'=='' set NUGET_PACKAGES=%USERPROFILE%\.nuget\packages
-call :exec vstest.console.exe %this_dir%\Tests\ObjectLifetimeTests\bin\%cswinrt_platform%\%cswinrt_configuration%\net7.0-windows10.0.19041.0\win10-%cswinrt_platform%\ObjectLifetimeTests.Lifted.build.appxrecipe /TestAdapterPath:"%NUGET_PACKAGES%\mstest.testadapter\2.2.4-preview-20210513-02\build\_common" /framework:FrameworkUap10 /logger:trx;LogFileName=%this_dir%\VsTestResults.trx
+call :exec vstest.console.exe %this_dir%\Tests\ObjectLifetimeTests\bin\%cswinrt_platform%\%cswinrt_configuration%\net7.0-windows10.0.19041.0\win10-%cswinrt_platform%\ObjectLifetimeTests.Lifted.build.appxrecipe /TestAdapterPath:"%NUGET_PACKAGES%\mstest.testadapter\2.2.4-preview-20210513-02\build\_common" /framework:FrameworkUap10 /logger:trx;LogFileName=%this_dir%\VsTestResults.trx
if ErrorLevel 1 (
echo.
echo ERROR: Lifetime test failed, skipping NuGet pack
@@ -231,17 +231,17 @@ if ErrorLevel 1 (
:hosttest
rem Run WinRT.Host tests
echo Running cswinrt host tests for %cswinrt_platform% %cswinrt_configuration%
-call :exec %this_dir%_build\%cswinrt_platform%\%cswinrt_configuration%\HostTest\bin\HostTest.exe --gtest_output=xml:%this_dir%hosttest_%cswinrt_version_string%.xml
+call :exec %this_dir%_build\%cswinrt_platform%\%cswinrt_configuration%\HostTest\bin\HostTest.exe --gtest_output=xml:%this_dir%hosttest_%cswinrt_version_string%.xml
if ErrorLevel 1 (
echo.
echo ERROR: Host test failed, skipping NuGet pack
exit /b !ErrorLevel!
)
-
+
:authortest
rem Run Authoring tests
echo Running cswinrt authoring tests for %cswinrt_platform% %cswinrt_configuration%
-call :exec %this_dir%_build\%cswinrt_platform%\%cswinrt_configuration%\AuthoringConsumptionTest\bin\AuthoringConsumptionTest.exe --gtest_output=xml:%this_dir%hosttest_%cswinrt_version_string%.xml
+call :exec %this_dir%_build\%cswinrt_platform%\%cswinrt_configuration%\AuthoringConsumptionTest\bin\AuthoringConsumptionTest.exe --gtest_output=xml:%this_dir%hosttest_%cswinrt_version_string%.xml
if ErrorLevel 1 (
echo.
echo ERROR: Authoring test failed, skipping NuGet pack
@@ -292,4 +292,4 @@ echo.
) else (
%*
)
-goto :eof
\ No newline at end of file
+goto :eof
From bf47b975093bd77b03193c9face20c34318cc6ec Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Fri, 4 Nov 2022 11:43:12 -0400
Subject: [PATCH 09/11] Fix build
---
.../AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj | 4 ++--
src/Tests/AuthoringConsumptionTest/packages.config | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
index ec838b343..d1454433a 100644
--- a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
+++ b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
@@ -105,7 +105,7 @@
-
+
@@ -209,7 +209,7 @@
-
+
diff --git a/src/Tests/AuthoringConsumptionTest/packages.config b/src/Tests/AuthoringConsumptionTest/packages.config
index a0aeee0c9..c26b4fa26 100644
--- a/src/Tests/AuthoringConsumptionTest/packages.config
+++ b/src/Tests/AuthoringConsumptionTest/packages.config
@@ -1,5 +1,6 @@
+
From 4e358332461111eedcdd60f1270e20bd34c99f94 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Fri, 4 Nov 2022 11:46:02 -0400
Subject: [PATCH 10/11] Update packages one final time
---
src/Authoring/WinRT.Host/WinRT.Host.vcxproj | 8 ++++----
src/Authoring/WinRT.Host/packages.config | 2 +-
.../AuthoringConsumptionTest.vcxproj | 16 ++++++++--------
.../AuthoringConsumptionTest/packages.config | 4 ++--
.../AuthoringWinUITest (Package).wapproj | 2 +-
.../AuthoringWinUITest.vcxproj | 16 ++++++++--------
.../AuthoringWinUITest/packages.config | 4 ++--
.../CSWinMDComponent/CSWinMDComponent.vcxproj | 8 ++++----
src/Tests/CSWinMDComponent/packages.config | 2 +-
src/Tests/HostTest/HostTest.vcxproj | 16 ++++++++--------
src/Tests/HostTest/packages.config | 4 ++--
.../TestComponentCSharp.vcxproj | 16 ++++++++--------
src/Tests/TestComponentCSharp/packages.config | 4 ++--
13 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj
index 26ee752fc..a2ae6768b 100644
--- a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj
+++ b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj
@@ -1,6 +1,6 @@
-
+
Debug
@@ -285,14 +285,14 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/Authoring/WinRT.Host/packages.config b/src/Authoring/WinRT.Host/packages.config
index 48319b8c9..cf213dffc 100644
--- a/src/Authoring/WinRT.Host/packages.config
+++ b/src/Authoring/WinRT.Host/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
index d1454433a..29f5c1a35 100644
--- a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
+++ b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
@@ -1,8 +1,8 @@
-
+
+
-
Debug
@@ -103,11 +103,11 @@
-
-
+
+
@@ -206,13 +206,13 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringConsumptionTest/packages.config b/src/Tests/AuthoringConsumptionTest/packages.config
index c26b4fa26..9722cb63c 100644
--- a/src/Tests/AuthoringConsumptionTest/packages.config
+++ b/src/Tests/AuthoringConsumptionTest/packages.config
@@ -2,7 +2,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj b/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj
index 1901b4e1e..7fb55a347 100644
--- a/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj
+++ b/src/Tests/AuthoringWinUITest/AuthoringWinUITest (Package)/AuthoringWinUITest (Package).wapproj
@@ -85,7 +85,7 @@
build
-
+
build
diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj
index a0bd063bd..48334f865 100644
--- a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj
+++ b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/AuthoringWinUITest.vcxproj
@@ -1,8 +1,8 @@
-
+
+
-
true
true
@@ -170,21 +170,21 @@
-
-
+
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config
index a0aeee0c9..961adaae8 100644
--- a/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config
+++ b/src/Tests/AuthoringWinUITest/AuthoringWinUITest/packages.config
@@ -1,7 +1,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj b/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
index c097606af..8e166b033 100644
--- a/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
+++ b/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
@@ -1,6 +1,6 @@
-
+
true
true
@@ -148,13 +148,13 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/CSWinMDComponent/packages.config b/src/Tests/CSWinMDComponent/packages.config
index 1cf4290e1..d01b35b3f 100644
--- a/src/Tests/CSWinMDComponent/packages.config
+++ b/src/Tests/CSWinMDComponent/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/src/Tests/HostTest/HostTest.vcxproj b/src/Tests/HostTest/HostTest.vcxproj
index 4f1c62f45..a9c2074fd 100644
--- a/src/Tests/HostTest/HostTest.vcxproj
+++ b/src/Tests/HostTest/HostTest.vcxproj
@@ -1,8 +1,8 @@
-
+
+
-
Debug
@@ -226,10 +226,10 @@
-
-
+
+
@@ -328,12 +328,12 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/Tests/HostTest/packages.config b/src/Tests/HostTest/packages.config
index c7fb8bd5b..73f3845ba 100644
--- a/src/Tests/HostTest/packages.config
+++ b/src/Tests/HostTest/packages.config
@@ -1,7 +1,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
index 3c8d5a650..ab0ab85a3 100644
--- a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
+++ b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj
@@ -1,8 +1,8 @@
-
+
+
-
high
true
@@ -125,19 +125,19 @@
-
-
+
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/Tests/TestComponentCSharp/packages.config b/src/Tests/TestComponentCSharp/packages.config
index 0236b5b99..48ef7cb89 100644
--- a/src/Tests/TestComponentCSharp/packages.config
+++ b/src/Tests/TestComponentCSharp/packages.config
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
From 250fdc7661bf4d51e097d8b5df93103815035dfd Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Sat, 5 Nov 2022 13:10:54 -0400
Subject: [PATCH 11/11] Fix build
---
src/Samples/TestEmbedded/build.cmd | 2 +-
src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Samples/TestEmbedded/build.cmd b/src/Samples/TestEmbedded/build.cmd
index e8b2a9cf1..493795bca 100644
--- a/src/Samples/TestEmbedded/build.cmd
+++ b/src/Samples/TestEmbedded/build.cmd
@@ -22,7 +22,7 @@ if exist %nuget_dir%\nuget.exe (
)
)
if not exist %nuget_dir% md %nuget_dir%
-if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.3.0/nuget.exe -OutFile %nuget_dir%\nuget.exe"
+if not exist %nuget_dir%\nuget.exe powershell -Command "Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.3.1/nuget.exe -OutFile %nuget_dir%\nuget.exe"
%nuget_dir%\nuget update -self
call :exec %nuget_dir%\nuget.exe restore %nuget_params% %this_dir%TestEmbedded.sln
diff --git a/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj b/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
index 8e166b033..f710f0ecd 100644
--- a/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
+++ b/src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj
@@ -154,6 +154,7 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+