This repository was archived by the owner on Nov 27, 2024. It is now read-only.

Commit a0480c8

committed

Fix incorrect merge

1 parent bcbffee commit a0480c8Copy full SHA for a0480c8

File tree

-318

lines changed

-318

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`<ItemGroup>`
`12`	`12`	`<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />`
`13`	`13`	`<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />`
`14`		`- <PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.16.1" />`
	`14`	`+ <PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.16.1" />`
`15`	`15`	`</ItemGroup>`
`16`	`16`
`17`	`17`	`<ItemGroup>`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,7 @@`
`50`	`50`	`<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />`
`51`	`51`	`<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />`
`52`	`52`	`<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />`
`53`		`- <PackageReference Include="Microsoft.ML.OnnxRuntime.Gpu" Version="1.16.1" />`
`54`		`- <PackageReference Include="LibGit2Sharp" Version="0.28.0" />`
	`53`	`+ <PackageReference Include="Microsoft.ML.OnnxRuntime.DirectML" Version="1.16.1" />`
`55`	`54`	`<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />`
`56`	`55`	`</ItemGroup>`
`57`	`56`

Comments

(0)