Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
one as a template. The following line is a marker to insert the test restore sources.
-->
<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
<!-- Local nupkgs for validating dotnet/xharness PR #1597 (NativeAOT POC).
Absolute path because the workload-testing SDK generates restore projects
in deep nested directories, and NuGet re-resolves relative source paths
against the generated nuget.config's location, not against this one.
/__w/1/s/ is the dnceng-public AzDO Linux/macOS agent workspace.
D:\a\1\s is the Windows agent equivalent. Both entries are listed; only
the matching one will resolve, the other is silently ignored.
Remove these entries and eng/local-xharness/ before merging. -->
<add key="local-xharness-pr-1597-linux" value="/__w/1/s/eng/local-xharness" />
<add key="local-xharness-pr-1597-windows" value="D:\a\1\s\eng\local-xharness" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
6 changes: 3 additions & 3 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ This file should be imported by eng/Versions.props
<SystemTextRegularExpressionsTestDataPackageVersion>11.0.0-beta.26302.1</SystemTextRegularExpressionsTestDataPackageVersion>
<SystemWindowsExtensionsTestDataPackageVersion>11.0.0-beta.26302.1</SystemWindowsExtensionsTestDataPackageVersion>
<!-- dotnet-xharness dependencies -->
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessCLIPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.26279.1</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
<MicrosoftDotNetXHarnessCLIPackageVersion>11.0.0-prerelease.26308.1</MicrosoftDotNetXHarnessCLIPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>11.0.0-prerelease.26308.1</MicrosoftDotNetXHarnessTestRunnersCommonPackageVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>11.0.0-prerelease.26308.1</MicrosoftDotNetXHarnessTestRunnersXunitPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,17 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>0eae08ed2f094f44e0151e4815e7cdd1a334fcdf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="11.0.0-prerelease.26279.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="11.0.0-prerelease.26308.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2cee83bf4841d72c9734a343f3003aeabdd46edf</Sha>
<Sha>1b5c7a70e84e1122165bc923252be1fe536a5c1f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="11.0.0-prerelease.26279.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="11.0.0-prerelease.26308.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2cee83bf4841d72c9734a343f3003aeabdd46edf</Sha>
<Sha>1b5c7a70e84e1122165bc923252be1fe536a5c1f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.26279.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="11.0.0-prerelease.26308.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>2cee83bf4841d72c9734a343f3003aeabdd46edf</Sha>
<Sha>1b5c7a70e84e1122165bc923252be1fe536a5c1f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="11.0.0-beta.26257.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down
3 changes: 3 additions & 0 deletions eng/local-xharness/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Override the repo-wide *.nupkg ignore for this folder so the local feed
# nupkgs for the dotnet/xharness PR #1597 validation can be committed.
!*.nupkg
Comment on lines +1 to +3
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading