Update dependencies

refs EP-47383
BluewireTechnologies · Dec 19, 2023 · 7568fa1 · 7568fa1
1 parent 74b3b73
commit 7568fa1
Show file tree

Hide file tree

Showing 26 changed files with 206 additions and 46 deletions.
diff --git a/...ire.Common.GitWrapper.IntegrationTests/Bluewire.Common.GitWrapper.IntegrationTests.csproj b/...ire.Common.GitWrapper.IntegrationTests/Bluewire.Common.GitWrapper.IntegrationTests.csproj
@@ -11,10 +11,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console.NUnit3">
-      <Version>9.2.2</Version>
+      <Version>10.0.0</Version>
     </PackageReference>
     <PackageReference Include="log4net">
-      <Version>2.0.12</Version>
+      <Version>2.0.15</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>

diff --git a/Bluewire.Common.GitWrapper.UnitTests/Bluewire.Common.GitWrapper.UnitTests.csproj b/Bluewire.Common.GitWrapper.UnitTests/Bluewire.Common.GitWrapper.UnitTests.csproj
@@ -10,13 +10,13 @@
     <ProjectReference Include="..\Bluewire.Common.GitWrapper\Bluewire.Common.GitWrapper.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.38" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/Bluewire.Common.GitWrapper/Bluewire.Common.GitWrapper.csproj b/Bluewire.Common.GitWrapper/Bluewire.Common.GitWrapper.csproj
@@ -13,7 +13,7 @@
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.2.4" />
+    <PackageReference Include="CliWrap" Version="3.6.4" />
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/Bluewire.Conventions.UnitTests/Bluewire.Conventions.UnitTests.csproj b/Bluewire.Conventions.UnitTests/Bluewire.Conventions.UnitTests.csproj
@@ -10,7 +10,7 @@
     <ProjectReference Include="..\Bluewire.Conventions\Bluewire.Conventions.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.dotCover.CommandLineTools" Version="2021.2.2">
+    <PackageReference Include="JetBrains.dotCover.CommandLineTools" Version="2023.2.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -19,7 +19,7 @@
       <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.38" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/Bluewire.RepositoryLinter/Bluewire.RepositoryLinter.csproj b/Bluewire.RepositoryLinter/Bluewire.RepositoryLinter.csproj
@@ -8,12 +8,12 @@
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console.NUnit3" Version="10.0.0" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.23" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Bluewire.Stash.IntegrationTests/Bluewire.Stash.IntegrationTests.csproj b/Bluewire.Stash.IntegrationTests/Bluewire.Stash.IntegrationTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console.NUnit3">
-      <Version>9.2.2</Version>
+      <Version>10.0.0</Version>
     </PackageReference>
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit">
@@ -19,8 +19,8 @@
     <PackageReference Include="NUnit.Extension.TeamCityEventListener">
       <Version>1.0.9</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Bluewire.Stash.Tool\Bluewire.Stash.Tool.csproj" />

diff --git a/Bluewire.Stash.Service/Bluewire.Stash.Service.csproj b/Bluewire.Stash.Service/Bluewire.Stash.Service.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.4.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.8.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.15" />
+    <PackageReference Include="Azure.Identity" Version="1.10.4" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.25" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Bluewire.Stash.Tool/Bluewire.Stash.Tool.csproj b/Bluewire.Stash.Tool/Bluewire.Stash.Tool.csproj
@@ -8,10 +8,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.8.4" />
-    <PackageReference Include="Costura.Fody" Version="4.1.0" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
-    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.18.4" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
+    <PackageReference Include="Costura.Fody" Version="5.7.0">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
+    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.58.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Bluewire.Stash.Tool/FodyWeavers.xsd b/Bluewire.Stash.Tool/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/Bluewire.Stash.UnitTests/Bluewire.Stash.UnitTests.csproj b/Bluewire.Stash.UnitTests/Bluewire.Stash.UnitTests.csproj
@@ -7,17 +7,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.dotCover.CommandLineTools" Version="2021.2.2">
+    <PackageReference Include="JetBrains.dotCover.CommandLineTools" Version="2023.2.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.38" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.39" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Bluewire.Stash/Bluewire.Stash.csproj b/Bluewire.Stash/Bluewire.Stash.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.12" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Tools.GitRepository.IntegrationTests/Bluewire.Tools.GitRepository.IntegrationTests.csproj b/...Tools.GitRepository.IntegrationTests/Bluewire.Tools.GitRepository.IntegrationTests.csproj
@@ -13,10 +13,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console.NUnit3">
-      <Version>9.2.2</Version>
+      <Version>10.0.0</Version>
     </PackageReference>
     <PackageReference Include="log4net">
-      <Version>2.0.12</Version>
+      <Version>2.0.15</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>

diff --git a/Bluewire.Tools.Runner.IntegrationTests/Bluewire.Tools.Runner.IntegrationTests.csproj b/Bluewire.Tools.Runner.IntegrationTests/Bluewire.Tools.Runner.IntegrationTests.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console.NUnit3">
-      <Version>9.2.2</Version>
+      <Version>10.0.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="Bluewire.Tools.Runner.IntegrationTests.targets" />

diff --git a/Bluewire.Tools.Runner/Bluewire.Tools.Runner.csproj b/Bluewire.Tools.Runner/Bluewire.Tools.Runner.csproj
@@ -15,11 +15,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console">
-      <Version>11.1.0</Version>
+      <Version>12.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Costura.Fody" Version="5.7.0">
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Costura.Fody" Version="4.1.0" />
     <PackageReference Include="log4net">
-      <Version>2.0.12</Version>
+      <Version>2.0.15</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />

diff --git a/Bluewire.Tools.Runner/FodyWeavers.xsd b/Bluewire.Tools.Runner/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/CanaryBuilder.IntegrationTests/CanaryBuilder.IntegrationTests.csproj b/CanaryBuilder.IntegrationTests/CanaryBuilder.IntegrationTests.csproj
@@ -13,10 +13,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console.NUnit3">
-      <Version>9.2.2</Version>
+      <Version>10.0.0</Version>
     </PackageReference>
     <PackageReference Include="log4net">
-      <Version>2.0.12</Version>
+      <Version>2.0.15</Version>
     </PackageReference>
     <PackageReference Include="Moq">
       <Version>4.20.70</Version>

diff --git a/CanaryBuilder/CanaryBuilder.csproj b/CanaryBuilder/CanaryBuilder.csproj
@@ -12,11 +12,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bluewire.Common.Console">
-      <Version>11.1.0</Version>
+      <Version>12.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Costura.Fody" Version="5.7.0">
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Costura.Fody" Version="4.1.0" />
     <PackageReference Include="log4net">
-      <Version>2.0.12</Version>
+      <Version>2.0.15</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>

diff --git a/CanaryBuilder/FodyWeavers.xsd b/CanaryBuilder/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>