Merge branch 'main' into feature/uniqueNamespaceGeneration

GitTools · Jul 16, 2023 · d907c8c · d907c8c
2 parents 3a382b1 + 63f7d27
commit d907c8c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
  "sdk": {
- "version": "7.0.103"
+ "version": "7.0.306"
  }
-}
+}
diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props
@@ -5,7 +5,7 @@
  <ItemGroup>
  <PackageVersion Include="LibGit2Sharp" Version="0.27.2" />
  <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
- <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+ <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
  <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
  <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
  <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
@@ -18,4 +18,4 @@
  <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
  <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
  </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -26,7 +26,7 @@
  <PackageVersion Include="NUnit" Version="3.13.3" />
  <PackageVersion Include="NUnit.Analyzers" Version="3.6.1" />
  <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
- <PackageVersion Include="JunitXml.TestLogger" Version="3.0.125" />
+ <PackageVersion Include="JunitXml.TestLogger" Version="3.0.134" />
  <PackageVersion Include="Roslynator.Analyzers" Version="4.3.0" />
  <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.3.0" />
  <PackageVersion Include="Shouldly" Version="4.2.1" />

diff --git a/src/GitVersion.sln b/src/GitVersion.sln
@@ -40,6 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{542E443E-14C
  ..\GitVersion.yml = ..\GitVersion.yml
  ..\schemas\6.0\GitVersion.configuration.json = ..\schemas\6.0\GitVersion.configuration.json
  ..\schemas\6.0\GitVersion.json = ..\schemas\6.0\GitVersion.json
+ ..\global.json = ..\global.json
  EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "readme", "readme", "{1F4BE015-699F-464A-8FF0-D8762102421A}"