Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Merge branch 'main' into CatalogReferences
# Conflicts:
#	Sdk/Sdk.csproj
#	SdkTests/SdkTests.csproj
  • Loading branch information
MichielOda committed Feb 21, 2025
commit 8d082bb8705bd7751e12cba09cb73247bde27cea
4 changes: 2 additions & 2 deletions Sdk/Sdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ By integrating this SDK into your build process, you can easily generate install
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
<PackageReference Include="Skyline.DataMiner.CICD.DMApp.Common" Version="2.0.15" />
<PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.1.0" />
<PackageReference Include="Skyline.DataMiner.CICD.DMApp.Common" Version="2.0.16" />
<PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.1.2" />
<PackageReference Include="Skyline.DataMiner.Core.AppPackageCreator" Version="2.1.0-delta" />
<PackageReference Include="Skyline.DataMiner.Core.ArtifactDownloader" Version="2.1.0-delta" />
<PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion SdkTests/SdkTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="7.1.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="MSTest" Version="3.7.3" />
<PackageReference Include="MSTest" Version="3.8.2" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.1" />
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.