Skip to content

Plugins sync/merge robot ultimate master 2025 04 09 1 #839

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

Merged
merged 2 commits into from
Apr 9, 2025
Merged

Plugins sync/merge robot ultimate master 2025 04 09 1 #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5a1ad3
[dotnet] Fix nuget.org package source in plug-in's nuget.config files.
ww898 Apr 7, 2025
8c0d8de
[dotnet] Fix DotNetTestCodeCompiler test in resharper-fsharp plugin.
ww898 Apr 7, 2025
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: 1 addition & 1 deletion ReSharper.FSharp/nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
26 changes: 13 additions & 13 deletions ReSharper.FSharp/test/data/TestAssembliesSources/nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="repositoryPath" value="C:\temp\JetTestPackages" />
</config>
<packageSources>
<clear />

<!-- JetBrains .NET division feed -->
<add key="dotnet_build_space" value="https://packages.jetbrains.team/nuget/p/net/build/v3/index.json" protocolVersion="3" />

<!-- JetBrains .NET division test data feed -->
<add key="dotnet_test_data_space" value="https://packages.jetbrains.team/nuget/p/net/test-data/v3/index.json" protocolVersion="3" />

<!-- Release .NET SDK feed -->
<add key="nuget-org" value="https://api.nuget.org/v3/index.json" />
<add key="resharper-platform" value="https://resharper-platform.jetbrains.com/api/v2/" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<packageRestore>
<add key="enabled" value="True" />
</packageRestore>
<disabledPackageSources>
<clear />
</disabledPackageSources>
</configuration>
<packageRestore>
<!-- Allow NuGet to download missing packages -->
<add key="enabled" value="True" />

<!-- Automatically check for missing packages during build in Visual Studio -->
<add key="automatic" value="False" />
</packageRestore>
</configuration>
2 changes: 1 addition & 1 deletion ReSharper.FSharp/test/data/nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<packageSources>
<clear />
<add key="resharper-platform" value="https://resharper-platform.jetbrains.com/api/v2/" />
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
2 changes: 1 addition & 1 deletion ReSharper.FSharp/test/src/FSharp.Tests.Common/src/Common.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ type TestReferenceProjectOutput(projectName: string) =
member this.Inherits = true

member this.GetReferences(test, packageManager, targetFrameworkId) =
let compiler = DotNetTestCodeCompiler(test.TestLifetime)
let compiler = DotNetTestCodeCompiler(test.TestLifetime, DotNetTestCodeCompiler.ContinuousIntegrationMode.External)
let slnPath = test.BaseTestDataPath / "TestAssembliesSources" / "TestAssembliesSources.sln"

let compileResult =
Expand Down
Loading