Skip to content
Merged
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
2 changes: 2 additions & 0 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ extends:
name: $(DncEngInternalBuildPool)
image: windows.vs2022preview.amd64
os: windows
settings:
networkIsolationPolicy: Permissive,CFSClean
customBuildTags:
- ES365AIMigrationTooling
stages:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ public class Test : CSharpCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
{
public Test()
{
string nuGetConfigFilePath = Path.Combine(RootFinder.Find(), "NuGet.config");
#if NET462
ReferenceAssemblies = ReferenceAssemblies.NetFramework.Net462.Default;
ReferenceAssemblies = ReferenceAssemblies.NetFramework.Net462.WithNuGetConfigFilePath(nuGetConfigFilePath);
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(ValueTask<>).Assembly.Location));
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(IAsyncDisposable).Assembly.Location));
#else
ReferenceAssemblies = ReferenceAssemblies.Net.Net80;
ReferenceAssemblies = ReferenceAssemblies.Net.Net80.WithNuGetConfigFilePath(nuGetConfigFilePath);
#endif
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(ParallelizeAttribute).Assembly.Location));
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(TestContext).Assembly.Location));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ public class Test : VisualBasicCodeFixTest<TAnalyzer, TCodeFix, DefaultVerifier>
{
public Test()
{
string nuGetConfigFilePath = Path.Combine(RootFinder.Find(), "NuGet.config");
#if NET462
ReferenceAssemblies = ReferenceAssemblies.NetFramework.Net462.Default;
ReferenceAssemblies = ReferenceAssemblies.NetFramework.Net462.WithNuGetConfigFilePath(nuGetConfigFilePath);
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(ValueTask<>).Assembly.Location));
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(IAsyncDisposable).Assembly.Location));
#else
ReferenceAssemblies = ReferenceAssemblies.Net.Net80;
ReferenceAssemblies = ReferenceAssemblies.Net.Net80.WithNuGetConfigFilePath(nuGetConfigFilePath);
#endif
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(ParallelizeAttribute).Assembly.Location));
TestState.AdditionalReferences.Add(MetadataReference.CreateFromFile(typeof(TestContext).Assembly.Location));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@ public async Task<GeneratorCompilationResult> CompileAndExecuteAsync(string[] so
{
if (Net80MetadataReferences is null)
{
string nuGetConfigFilePath = Path.Combine(RootFinder.Find(), "NuGet.config");

Net80MetadataReferences =
await ReferenceAssemblies.Net.Net80.ResolveAsync(LanguageNames.CSharp, cancellationToken);
await ReferenceAssemblies.Net.Net80.WithNuGetConfigFilePath(nuGetConfigFilePath).ResolveAsync(LanguageNames.CSharp, cancellationToken);

GC.Collect();
GC.WaitForPendingFinalizers();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,12 @@ public static string GetNuGetConfig(bool addPublicFeeds = false, bool addHashFil
{
string publicFeedsFragment = addPublicFeeds
? """
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
<add key="test-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/test-tools/nuget/v3/index.json" />
"""
: string.Empty;

string publicFeedsMapping = addPublicFeeds
? """
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
<packageSource key="test-tools">
<package pattern="*" />
</packageSource>
Expand Down
Loading