From 5e0acff34cc124dc6873e83cd9b710bd3220c1bd Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 07:51:27 +0000
Subject: [PATCH 01/10] Init
---
.../Files.App.CsWin32.csproj | 21 --------
src/Files.App.Server/Files.App.Server.csproj | 1 -
src/Files.App/Files.App.csproj | 1 -
.../Files.Core.SourceGenerator.csproj | 1 +
.../NativeMethods.json | 2 +-
.../NativeMethods.txt | 2 +-
.../Windows.Win32/Windows.Win32.ComPtr.cs | 53 +++++++++++++++++++
.../Windows.Win32}/Windows.Win32.Extras.cs | 0
8 files changed, 56 insertions(+), 25 deletions(-)
delete mode 100644 src/Files.App.CsWin32/Files.App.CsWin32.csproj
rename src/{Files.App.CsWin32 => Files.Core.SourceGenerator}/NativeMethods.json (96%)
rename src/{Files.App.CsWin32 => Files.Core.SourceGenerator}/NativeMethods.txt (98%)
create mode 100644 src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
rename src/{Files.App.CsWin32 => Files.Core.SourceGenerator/Windows.Win32}/Windows.Win32.Extras.cs (100%)
diff --git a/src/Files.App.CsWin32/Files.App.CsWin32.csproj b/src/Files.App.CsWin32/Files.App.CsWin32.csproj
deleted file mode 100644
index 096cca9f7150..000000000000
--- a/src/Files.App.CsWin32/Files.App.CsWin32.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- net8.0-windows10.0.22621.0
- 10.0.19041.0
- enable
- true
- Debug;Release;Stable;Preview;Store
- x86;x64;arm64
- win-x86;win-x64;win-arm64
- TRACE;DEBUG;NETFX_CORE
- TRACE;RELEASE;NETFX_CORE
- true
-
-
-
-
-
-
-
diff --git a/src/Files.App.Server/Files.App.Server.csproj b/src/Files.App.Server/Files.App.Server.csproj
index 18505e84998e..157c348d648d 100644
--- a/src/Files.App.Server/Files.App.Server.csproj
+++ b/src/Files.App.Server/Files.App.Server.csproj
@@ -51,7 +51,6 @@
-
diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj
index 6b04285eea25..b2acb2848167 100644
--- a/src/Files.App/Files.App.csproj
+++ b/src/Files.App/Files.App.csproj
@@ -103,7 +103,6 @@
-
diff --git a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
index d5a989422c4b..a061344481b0 100644
--- a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
+++ b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
@@ -19,6 +19,7 @@
+
diff --git a/src/Files.App.CsWin32/NativeMethods.json b/src/Files.Core.SourceGenerator/NativeMethods.json
similarity index 96%
rename from src/Files.App.CsWin32/NativeMethods.json
rename to src/Files.Core.SourceGenerator/NativeMethods.json
index 2e32fa443533..dde48adb93be 100644
--- a/src/Files.App.CsWin32/NativeMethods.json
+++ b/src/Files.Core.SourceGenerator/NativeMethods.json
@@ -1,4 +1,4 @@
-{
+{
"$schema": "https://aka.ms/CsWin32.schema.json",
"allowMarshaling": false,
"public": true,
diff --git a/src/Files.App.CsWin32/NativeMethods.txt b/src/Files.Core.SourceGenerator/NativeMethods.txt
similarity index 98%
rename from src/Files.App.CsWin32/NativeMethods.txt
rename to src/Files.Core.SourceGenerator/NativeMethods.txt
index 9d7c337d7c4d..7068963133c6 100644
--- a/src/Files.App.CsWin32/NativeMethods.txt
+++ b/src/Files.Core.SourceGenerator/NativeMethods.txt
@@ -1,4 +1,4 @@
-// Copyright (c) 2024 Files Community
+// Copyright (c) 2024 Files Community
// Licensed under the MIT License. See the LICENSE.
WNDPROC
diff --git a/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs b/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
new file mode 100644
index 000000000000..89097a4ee742
--- /dev/null
+++ b/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
@@ -0,0 +1,53 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using System;
+using System.Runtime.CompilerServices;
+using Windows.Win32;
+using Windows.Win32.System.Com;
+
+namespace Windows.Win32
+{
+ ///
+ /// A struct that works with COM pointers safely and securely.
+ ///
+ public unsafe struct ComPtr : IDisposable where T : unmanaged
+ {
+ private T* _ptr;
+
+ public bool IsNull
+ => _ptr == default;
+
+ public ComPtr(T* other)
+ {
+ _ptr = other;
+
+ if (other is not null)
+ ((IUnknown*)other)->AddRef();
+ }
+
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public readonly T* Get()
+ {
+ return _ptr;
+ }
+
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public readonly T** GetAddress()
+ {
+ return (T**)Unsafe.AsPointer(ref Unsafe.AsRef(in this));
+ }
+
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public void Dispose()
+ {
+ T* pointer = _ptr;
+
+ if (pointer is not null)
+ {
+ _ptr = null;
+ ((IUnknown*)pointer)->Release();
+ }
+ }
+ }
+}
diff --git a/src/Files.App.CsWin32/Windows.Win32.Extras.cs b/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.Extras.cs
similarity index 100%
rename from src/Files.App.CsWin32/Windows.Win32.Extras.cs
rename to src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.Extras.cs
From 383412eec2c590d252e238da7f4307eb1de1941c Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 07:53:55 +0000
Subject: [PATCH 02/10] Remove bom from text files
---
src/Files.Core.SourceGenerator/NativeMethods.json | 2 +-
src/Files.Core.SourceGenerator/NativeMethods.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Files.Core.SourceGenerator/NativeMethods.json b/src/Files.Core.SourceGenerator/NativeMethods.json
index dde48adb93be..2e32fa443533 100644
--- a/src/Files.Core.SourceGenerator/NativeMethods.json
+++ b/src/Files.Core.SourceGenerator/NativeMethods.json
@@ -1,4 +1,4 @@
-{
+{
"$schema": "https://aka.ms/CsWin32.schema.json",
"allowMarshaling": false,
"public": true,
diff --git a/src/Files.Core.SourceGenerator/NativeMethods.txt b/src/Files.Core.SourceGenerator/NativeMethods.txt
index 7068963133c6..9d7c337d7c4d 100644
--- a/src/Files.Core.SourceGenerator/NativeMethods.txt
+++ b/src/Files.Core.SourceGenerator/NativeMethods.txt
@@ -1,4 +1,4 @@
-// Copyright (c) 2024 Files Community
+// Copyright (c) 2024 Files Community
// Licensed under the MIT License. See the LICENSE.
WNDPROC
From a5e511ddc803504fba8117ca5f639c6a341687c4 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 08:24:07 +0000
Subject: [PATCH 03/10] update
---
.../{Parser => Utilities}/JsonParser.cs | 0
.../{Parser => Utilities}/ReswParser.cs | 0
.../Windows.Win32/Windows.Win32.ComPtr.cs | 17 ++++++++---------
3 files changed, 8 insertions(+), 9 deletions(-)
rename src/Files.Core.SourceGenerator/{Parser => Utilities}/JsonParser.cs (100%)
rename src/Files.Core.SourceGenerator/{Parser => Utilities}/ReswParser.cs (100%)
diff --git a/src/Files.Core.SourceGenerator/Parser/JsonParser.cs b/src/Files.Core.SourceGenerator/Utilities/JsonParser.cs
similarity index 100%
rename from src/Files.Core.SourceGenerator/Parser/JsonParser.cs
rename to src/Files.Core.SourceGenerator/Utilities/JsonParser.cs
diff --git a/src/Files.Core.SourceGenerator/Parser/ReswParser.cs b/src/Files.Core.SourceGenerator/Utilities/ReswParser.cs
similarity index 100%
rename from src/Files.Core.SourceGenerator/Parser/ReswParser.cs
rename to src/Files.Core.SourceGenerator/Utilities/ReswParser.cs
diff --git a/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs b/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
index 89097a4ee742..619230c99500 100644
--- a/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
+++ b/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
@@ -9,7 +9,7 @@
namespace Windows.Win32
{
///
- /// A struct that works with COM pointers safely and securely.
+ /// Contains a COM pointer and a set of methods to work with the pointer safely.
///
public unsafe struct ComPtr : IDisposable where T : unmanaged
{
@@ -18,12 +18,12 @@ public unsafe struct ComPtr : IDisposable where T : unmanaged
public bool IsNull
=> _ptr == default;
- public ComPtr(T* other)
+ public ComPtr(T* ptr)
{
- _ptr = other;
+ _ptr = ptr;
- if (other is not null)
- ((IUnknown*)other)->AddRef();
+ if (ptr is not null)
+ ((IUnknown*)ptr)->AddRef();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -33,7 +33,7 @@ public ComPtr(T* other)
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
- public readonly T** GetAddress()
+ public readonly T** GetAddressOf()
{
return (T**)Unsafe.AsPointer(ref Unsafe.AsRef(in this));
}
@@ -41,9 +41,8 @@ public ComPtr(T* other)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Dispose()
{
- T* pointer = _ptr;
-
- if (pointer is not null)
+ T* ptr = _ptr;
+ if (ptr is not null)
{
_ptr = null;
((IUnknown*)pointer)->Release();
From 9e09bb2abbef19ac62ff6a818aa8fe38d136df9b Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 08:33:39 +0000
Subject: [PATCH 04/10] Update Files.sln
---
Files.sln | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/Files.sln b/Files.sln
index 87aeb70599c3..e4fe372f0014 100644
--- a/Files.sln
+++ b/Files.sln
@@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App", "src\Files.App\
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Files.Package", "src\Files.App (Package)\Files.Package.wapproj", "{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.Core.SourceGenerator", "src\Files.Core.SourceGenerator\Files.Core.SourceGenerator.csproj", "{6FA07816-DE0A-4D49-84E8-38E953A33C87}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.Server", "src\Files.App.Server\Files.App.Server.csproj", "{1EE996D6-885E-4403-A461-26C7A4E14D26}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Files.App.SaveDialog", "src\Files.App.SaveDialog\Files.App.SaveDialog.vcxproj", "{EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6}"
@@ -361,36 +359,6 @@ Global
{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x86.ActiveCfg = Store|x86
{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x86.Build.0 = Store|x86
{8F60FD8E-1921-47D6-97B0-D26D7B3A4999}.Store|x86.Deploy.0 = Store|x86
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|arm64.ActiveCfg = Debug|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|arm64.Build.0 = Debug|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x64.ActiveCfg = Debug|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x64.Build.0 = Debug|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x86.ActiveCfg = Debug|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Debug|x86.Build.0 = Debug|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|arm64.ActiveCfg = Preview|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|arm64.Build.0 = Preview|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x64.ActiveCfg = Preview|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x64.Build.0 = Preview|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x86.ActiveCfg = Preview|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Preview|x86.Build.0 = Preview|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|arm64.ActiveCfg = Release|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|arm64.Build.0 = Release|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x64.ActiveCfg = Release|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x64.Build.0 = Release|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x86.ActiveCfg = Release|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Release|x86.Build.0 = Release|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|arm64.ActiveCfg = Stable|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|arm64.Build.0 = Stable|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x64.ActiveCfg = Stable|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x64.Build.0 = Stable|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x86.ActiveCfg = Stable|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Stable|x86.Build.0 = Stable|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|arm64.ActiveCfg = Store|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|arm64.Build.0 = Store|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x64.ActiveCfg = Store|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x64.Build.0 = Store|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x86.ActiveCfg = Store|Any CPU
- {6FA07816-DE0A-4D49-84E8-38E953A33C87}.Store|x86.Build.0 = Store|Any CPU
{1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|arm64.ActiveCfg = Debug|arm64
{1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|arm64.Build.0 = Debug|arm64
{1EE996D6-885E-4403-A461-26C7A4E14D26}.Debug|arm64.Deploy.0 = Debug|arm64
@@ -614,7 +582,6 @@ Global
{25FD5045-6D4C-4DD0-B3AC-613AB59CBB07} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
{6F431D82-A5FF-4833-B5E4-702E1E523126} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
{8F60FD8E-1921-47D6-97B0-D26D7B3A4999} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
- {6FA07816-DE0A-4D49-84E8-38E953A33C87} = {9F36C2AD-005D-4EA5-A1F1-6BC42773FC85}
{1EE996D6-885E-4403-A461-26C7A4E14D26} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
{EBFA367F-CBDB-4CD0-B838-D6B95F61D1F6} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
{7756A1A4-17B5-4E6B-9B12-F19AA868A225} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
From ce15c043806538d23b87d86e27c939da6cce1f22 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 08:39:53 +0000
Subject: [PATCH 05/10] Update Files.sln
---
Files.sln | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/Files.sln b/Files.sln
index 87aeb70599c3..66c2de5f1c44 100644
--- a/Files.sln
+++ b/Files.sln
@@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.UITests", "tests\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.Controls", "src\Files.App.Controls\Files.App.Controls.csproj", "{83FF8729-CC76-43E2-976F-47F0A187FC7E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Files.App.CsWin32", "src\Files.App.CsWin32\Files.App.CsWin32.csproj", "{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|arm64 = Debug|arm64
@@ -568,36 +566,6 @@ Global
{83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|arm64.ActiveCfg = Store|arm64
{83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|x64.ActiveCfg = Store|x64
{83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|x86.ActiveCfg = Store|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|arm64.ActiveCfg = Debug|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|arm64.Build.0 = Debug|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x64.ActiveCfg = Debug|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x64.Build.0 = Debug|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x86.ActiveCfg = Debug|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x86.Build.0 = Debug|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|arm64.ActiveCfg = Preview|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|arm64.Build.0 = Preview|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x64.ActiveCfg = Preview|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x64.Build.0 = Preview|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x86.ActiveCfg = Preview|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x86.Build.0 = Preview|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|arm64.ActiveCfg = Release|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|arm64.Build.0 = Release|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x64.ActiveCfg = Release|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x64.Build.0 = Release|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x86.ActiveCfg = Release|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x86.Build.0 = Release|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|arm64.ActiveCfg = Stable|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|arm64.Build.0 = Stable|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x64.ActiveCfg = Stable|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x64.Build.0 = Stable|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x86.ActiveCfg = Stable|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x86.Build.0 = Stable|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|arm64.ActiveCfg = Store|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|arm64.Build.0 = Store|arm64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x64.ActiveCfg = Store|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x64.Build.0 = Store|x64
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x86.ActiveCfg = Store|x86
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x86.Build.0 = Store|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -621,7 +589,6 @@ Global
{B3FE3F3B-CECC-4918-B72B-5488C3774125} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
{6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B} = {481DE2EA-E6CE-4A9C-A220-3B543B95AAA1}
{83FF8729-CC76-43E2-976F-47F0A187FC7E} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
- {4803E2CB-3E27-447D-94FC-45B5F96E4F7A} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0E62043C-A7A1-4982-9EC9-4CDB2939B776}
From cdc423106a69126366cf639517e930d8b0795bed Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:37:15 +0900
Subject: [PATCH 06/10] Update Files.Core.SourceGenerator.csproj
---
src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
index a061344481b0..adf4da1c4fa8 100644
--- a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
+++ b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
@@ -23,7 +23,6 @@
-
From 3343d51455445629183f14d02eda5df61e7b150e Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:37:31 +0900
Subject: [PATCH 07/10] Update
src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
Co-authored-by: Steve
---
.../Windows.Win32/Windows.Win32.ComPtr.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs b/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
index 619230c99500..b202a877693c 100644
--- a/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
+++ b/src/Files.Core.SourceGenerator/Windows.Win32/Windows.Win32.ComPtr.cs
@@ -45,7 +45,7 @@ public void Dispose()
if (ptr is not null)
{
_ptr = null;
- ((IUnknown*)pointer)->Release();
+ ((IUnknown*)ptr)->Release();
}
}
}
From f42c08fca31a968b0f97361bbe1abbfa52ac16b8 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:47:57 +0900
Subject: [PATCH 08/10] Update ParserItem.cs
---
src/Files.Core.SourceGenerator/Data/ParserItem.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Files.Core.SourceGenerator/Data/ParserItem.cs b/src/Files.Core.SourceGenerator/Data/ParserItem.cs
index e3ac10e30192..3bbff9c0e840 100644
--- a/src/Files.Core.SourceGenerator/Data/ParserItem.cs
+++ b/src/Files.Core.SourceGenerator/Data/ParserItem.cs
@@ -14,7 +14,7 @@ internal class ParserItem
///
/// This property is required and cannot be null or empty.
///
- internal required string Key { get; set; } = default!;
+ internal string Key { get; set; } = null!;
///
/// Gets or sets the value of the item.
From 673626b516843a714ee6be526f0f340e7a4a26e4 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 18:59:36 +0900
Subject: [PATCH 09/10] Update Files.Core.SourceGenerator.csproj
---
src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
index adf4da1c4fa8..a061344481b0 100644
--- a/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
+++ b/src/Files.Core.SourceGenerator/Files.Core.SourceGenerator.csproj
@@ -23,6 +23,7 @@
+
From ac9354aa9dc1767daa8c05b1a5015b4ec365d20d Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Sun, 8 Sep 2024 19:00:04 +0900
Subject: [PATCH 10/10] Update ParserItem.cs
---
src/Files.Core.SourceGenerator/Data/ParserItem.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Files.Core.SourceGenerator/Data/ParserItem.cs b/src/Files.Core.SourceGenerator/Data/ParserItem.cs
index 3bbff9c0e840..e3ac10e30192 100644
--- a/src/Files.Core.SourceGenerator/Data/ParserItem.cs
+++ b/src/Files.Core.SourceGenerator/Data/ParserItem.cs
@@ -14,7 +14,7 @@ internal class ParserItem
///
/// This property is required and cannot be null or empty.
///
- internal string Key { get; set; } = null!;
+ internal required string Key { get; set; } = default!;
///
/// Gets or sets the value of the item.