update packages

MahApp.Metro は変更量が大きいため適用しないことにした。
anoyetta · Sep 9, 2021 · 492f893 · 492f893
1 parent 9500f79
commit 492f893
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 50 deletions.
diff --git a/source/RINGS/RINGS.csproj b/source/RINGS/RINGS.csproj
@@ -254,18 +254,18 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Costura.Fody">
-      <Version>4.1.0</Version>
+      <Version>5.6.0</Version> 
+      <PrivateAssets>all</PrivateAssets> 
     </PackageReference>
     <PackageReference Include="Discord.Net">
-      <Version>2.2.0</Version>
+      <Version>2.4.0</Version> 
     </PackageReference>
     <PackageReference Include="Fody">
-      <Version>6.1.1</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+      <Version>6.5.2</Version> 
+      <PrivateAssets>all</PrivateAssets> 
     </PackageReference>
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
-      <Version>1.0.8</Version>
+      <Version>1.1.0</Version> 
     </PackageReference>
     <PackageReference Include="Hjson">
       <Version>3.0.0</Version>
@@ -289,19 +289,19 @@
       <Version>5.6.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
+      <Version>13.0.1</Version> 
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.7.0</Version>
+      <Version>4.7.11</Version> 
     </PackageReference>
     <PackageReference Include="Prism.Wpf">
-      <Version>7.2.0.1422</Version>
+      <Version>8.1.97</Version> 
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
-      <Version>3.2.8</Version>
+      <Version>3.4.0</Version> 
     </PackageReference>
     <PackageReference Include="Sharlayan">
-      <Version>5.0.5</Version>
+      <Version>7.0.1</Version> 
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/source/aframe/source/aframe.Core/FodyWeavers.xsd b/source/aframe/source/aframe.Core/FodyWeavers.xsd
@@ -11,6 +11,16 @@
                 <xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="TriggerDependentProperties" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if the Dependent properties feature is enabled.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="EnableIsChangedProperty" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Used to control if the IsChanged property feature is enabled.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="EventInvokerNames" type="xs:string">
               <xs:annotation>
                 <xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>

diff --git a/source/aframe/source/aframe.Core/aframe.Core.csproj b/source/aframe/source/aframe.Core/aframe.Core.csproj
@@ -215,9 +215,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Fody">
-      <Version>6.1.1</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
+      <Version>6.5.2</Version> 
+      <PrivateAssets>all</PrivateAssets> 
     </PackageReference>
     <PackageReference Include="Hjson">
       <Version>3.0.0</Version>
@@ -247,38 +246,39 @@
       <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
+      <Version>13.0.1</Version> 
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.7.0</Version>
+      <Version>4.7.11</Version> 
     </PackageReference>
     <PackageReference Include="Prism.Wpf">
-      <Version>7.2.0.1422</Version>
+      <Version>8.1.97</Version> 
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
-      <Version>3.2.8</Version>
-    </PackageReference>
-    <PackageReference Include="ReactiveProperty">
-      <Version>6.2.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource">
-      <Version>4.7.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Numerics.Vectors">
-      <Version>4.5.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Reactive">
-      <Version>4.4.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe">
-      <Version>4.7.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
+      <Version>3.4.0</Version> 
+      <PrivateAssets>all</PrivateAssets> 
     </PackageReference>
+    <PackageReference Include="ReactiveProperty"> 
+      <Version>7.12.0</Version> 
+    </PackageReference> 
+    <PackageReference Include="System.Diagnostics.DiagnosticSource"> 
+      <Version>5.0.1</Version> 
+    </PackageReference> 
+    <PackageReference Include="System.Numerics.Vectors"> 
+      <Version>4.5.0</Version> 
+    </PackageReference> 
+    <PackageReference Include="System.Reactive"> 
+      <Version>5.0.0</Version> 
+    </PackageReference> 
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> 
+      <Version>5.0.0</Version> 
+    </PackageReference> 
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation"> 
+      <Version>4.3.0</Version> 
+    </PackageReference> 
+    <PackageReference Include="System.ValueTuple"> 
+      <Version>4.5.0</Version> 
+    </PackageReference> 
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Updater.ico" />

diff --git a/source/aframe/source/aframe.Updater/FodyWeavers.xsd b/source/aframe/source/aframe.Updater/FodyWeavers.xsd
@@ -17,6 +17,16 @@
                   <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
                 <xs:annotation>
                   <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -43,6 +53,16 @@
                 <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="DisableCompression" type="xs:boolean">
               <xs:annotation>
                 <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -73,6 +93,16 @@
                 <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
               <xs:annotation>
                 <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>

diff --git a/source/aframe/source/aframe.Updater/aframe.Updater.csproj b/source/aframe/source/aframe.Updater/aframe.Updater.csproj
@@ -103,17 +103,17 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Costura.Fody">
-      <Version>4.1.0</Version>
-    </PackageReference>
-    <PackageReference Include="Fody">
-      <Version>6.1.1</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
-    </PackageReference>
+    <PackageReference Include="Costura.Fody"> 
+      <Version>5.6.0</Version> 
+      <PrivateAssets>all</PrivateAssets> 
+    </PackageReference> 
+    <PackageReference Include="Fody"> 
+      <Version>6.5.2</Version> 
+      <PrivateAssets>all</PrivateAssets> 
+    </PackageReference> 
+    <PackageReference Include="Newtonsoft.Json"> 
+      <Version>13.0.1</Version> 
+    </PackageReference> 
   </ItemGroup>
   <ItemGroup>
     <None Include="FodyWeavers.xml" />