Skip to content
Merged

sync #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
247a4b0
Merge pull request #546 from joecare99/master
joecare99 Jan 8, 2025
ad551de
Merge pull request #548 from joecare99/master
joecare99 Jan 8, 2025
a954bd7
Merge pull request #551 from joecare99/master
joecare99 Jan 8, 2025
9abdf16
Bump Microsoft.CodeAnalysis.CSharp.Workspaces in /Transpiler_pp
dependabot[bot] Jan 8, 2025
18467b5
Bump System.ServiceProcess.ServiceController in /JC-AMS
dependabot[bot] Jan 8, 2025
ddc1205
Bump MSTest.TestAdapter from 3.0.2 to 3.7.0 in /JC-AMS
dependabot[bot] Jan 8, 2025
692baee
Merge pull request #554 from joecare99/dependabot/nuget/JC-AMS/JC-AMS…
joecare99 Jan 8, 2025
d23af20
Merge pull request #555 from joecare99/dependabot/nuget/JC-AMS/JC-AMS…
joecare99 Jan 8, 2025
a1d0c04
Bump coverlet.collector from 6.0.2 to 6.0.3 in /TestStatements
dependabot[bot] Jan 8, 2025
d8c6747
Bump coverlet.collector from 6.0.2 to 6.0.3 in /Transpiler_pp
dependabot[bot] Jan 8, 2025
725ee33
Merge pull request #556 from joecare99/dependabot/nuget/TestStatement…
joecare99 Jan 8, 2025
5758853
Bump System.Management from 7.0.0 to 9.0.0 in /JC-AMS
dependabot[bot] Jan 8, 2025
619ac6a
Bump Microsoft.CodeAnalysis.CSharp and Microsoft.CodeAnalysis.Analyzers
dependabot[bot] Jan 8, 2025
8335da0
Merge branch 'JC-AMS' into dependabot/nuget/JC-AMS/JC-AMS/System.Mana…
joecare99 Jan 8, 2025
2d55534
Merge pull request #558 from joecare99/dependabot/nuget/JC-AMS/JC-AMS…
joecare99 Jan 8, 2025
a86ff57
Merge pull request #559 from joecare99/dependabot/nuget/Transpiler_pp…
joecare99 Jan 8, 2025
e59d604
Merge pull request #557 from joecare99/dependabot/nuget/Transpiler_pp…
joecare99 Jan 8, 2025
bce1d61
Merge pull request #552 from joecare99/dependabot/nuget/Transpiler_pp…
joecare99 Jan 8, 2025
5ce9ca2
Merge pull request #562 from joecare99/master
joecare99 Jan 8, 2025
7f279e1
Merge pull request #563 from joecare99/GenFreeWin
joecare99 Jan 8, 2025
a01db8d
Merge pull request #564 from joecare99/master
joecare99 Jan 8, 2025
a831b59
Merge pull request #565 from joecare99/Transpiler_pp
joecare99 Jan 8, 2025
094ff6f
Merge pull request #566 from joecare99/master
joecare99 Jan 8, 2025
53098bf
Merge pull request #567 from joecare99/TestStatements
joecare99 Jan 8, 2025
e5d8a03
Merge branch 'JC-AMS' into master
joecare99 Jan 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion JC-AMS/Core.Tests/Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
<PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
<PackageReference Include="coverlet.collector" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions JC-AMS/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.IO.Ports" Version="9.0.0" />
<PackageReference Condition="'$(TargetFramework)'=='net60-windows'" Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="System.Management" Version="7.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0" />
<PackageReference Include="System.Management" Version="9.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0" />
<PackageReference Condition="'$(TargetFramework)'=='net462-windows'" Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.3.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Transpiler_pp/Analyzer1/Analyzer1/Analyzer1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.8" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Transpiler_pp/TranspilerLibTests/TranspilerLibTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<None Remove="Resources\IECCodeBuilder\Test01\Tokens01.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector" Version="6.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading