Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the repo-local NuGet.config with GetReferenceAssemblies so we can use pre-release ref packs reliably. #1375

Merged
merged 3 commits into from
Aug 6, 2021
Merged

Use the repo-local NuGet.config with GetReferenceAssemblies so we can use pre-release ref packs reliably. #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e1d133
Use the repo-local NuGet.config with GetReferenceAssemblies so we can…
jkoritzinsky Aug 3, 2021
c1bd1cc
Copy NuGet.config to output path instead of searching up to the repo …
jkoritzinsky Aug 6, 2021
098065c
Update DllImportGenerator/DllImportGenerator.UnitTests/TestUtils.cs
jkoritzinsky Aug 6, 2021
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
4 changes: 4 additions & 0 deletions DllImportGenerator/DllImportGenerator.UnitTests/DllImportGenerator.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,8 @@
<ProjectReference Include="..\Ancillary.Interop\Ancillary.Interop.csproj" />
<ProjectReference Include="..\DllImportGenerator\DllImportGenerator.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="$(RepoRoot)/NuGet.config" Link="NuGet.config" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Project>
4 changes: 3 additions & 1 deletion DllImportGenerator/DllImportGenerator.UnitTests/TestUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.Diagnostics;
using Microsoft.CodeAnalysis.Testing;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.IO;
Expand Down Expand Up @@ -96,7 +97,8 @@ public static (ReferenceAssemblies, MetadataReference) GetReferenceAssemblies()
new PackageIdentity(
"Microsoft.NETCore.App.Ref",
"6.0.0-preview.6.21317.4"),
Path.Combine("ref", "net6.0"));
Path.Combine("ref", "net6.0"))
.WithNuGetConfigFilePath(Path.Combine(Path.GetDirectoryName(typeof(TestUtils).Assembly.Location)!, "NuGet.config"));

// Include the assembly containing the new attribute and all of its references.
// [TODO] Remove once the attribute has been added to the BCL
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
<!-- Roslyn dependencies -->
<CompilerPlatformVersion>3.10.0-3.21229.26</CompilerPlatformVersion>
<CompilerPlatformTestingVersion>1.0.1-beta1.20478.1</CompilerPlatformTestingVersion>
<CompilerPlatformTestingVersion>1.1.0</CompilerPlatformTestingVersion>
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.3-beta1.21268.3</MicrosoftCodeAnalysisAnalyzersVersion>
<!-- Package dependencies -->
<SystemCommandLineVersion>2.0.0-beta1.21118.1</SystemCommandLineVersion>
Expand Down