|
388 | 388 | <Uri>https://github.com/dotnet/winforms</Uri>
|
389 | 389 | <Sha>d876f24a18c1ad63690d19ef1e58dc1d8f798d4a</Sha>
|
390 | 390 | </Dependency>
|
391 |
| -<<<<<<< HEAD |
392 | 391 | <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24430.1">
|
393 | 392 | <Uri>https://github.com/dotnet/arcade</Uri>
|
394 | 393 | <Sha>0ed1d3dc15420cd41c252b0c5d9474f197a29e06</Sha>
|
|
414 | 413 | <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24430.1">
|
415 | 414 | <Uri>https://github.com/dotnet/arcade</Uri>
|
416 | 415 | <Sha>0ed1d3dc15420cd41c252b0c5d9474f197a29e06</Sha>
|
417 |
| -======= |
418 |
| - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24453.1"> |
419 |
| - <Uri>https://github.com/dotnet/arcade</Uri> |
420 |
| - <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha> |
421 |
| - </Dependency> |
422 |
| - <!-- Intermediate is necessary for source build. --> |
423 |
| - <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24453.1"> |
424 |
| - <Uri>https://github.com/dotnet/arcade</Uri> |
425 |
| - <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha> |
426 |
| - <SourceBuild RepoName="arcade" ManagedOnly="true" /> |
427 |
| - </Dependency> |
428 |
| - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24453.1"> |
429 |
| - <Uri>https://github.com/dotnet/arcade</Uri> |
430 |
| - <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha> |
431 |
| - </Dependency> |
432 |
| - <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24453.1"> |
433 |
| - <Uri>https://github.com/dotnet/arcade</Uri> |
434 |
| - <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha> |
435 |
| - </Dependency> |
436 |
| - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24453.1"> |
437 |
| - <Uri>https://github.com/dotnet/arcade</Uri> |
438 |
| - <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha> |
439 |
| - </Dependency> |
440 |
| - <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24453.1"> |
441 |
| - <Uri>https://github.com/dotnet/arcade</Uri> |
442 |
| - <Sha>dd332f2d4e21daa8b79f84251ab156af9a0b11b2</Sha> |
443 |
| ->>>>>>> a21e97ba40 (Update dependencies from https://github.com/dotnet/arcade build 20240903.1 (#57759)) |
444 | 416 | </Dependency>
|
445 | 417 | <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.8.24456.2">
|
446 | 418 | <Uri>https://github.com/dotnet/extensions</Uri>
|
|
0 commit comments