Skip to content
Merged
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
77 changes: 71 additions & 6 deletions src/backend/dotnet.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
use std::sync::Arc;

use crate::backend::VersionInfo;
use crate::backend::backend_type::BackendType;
use crate::backend::{
VersionInfo, filter_cached_prereleases, include_prereleases, mark_prerelease,
};
use crate::cli::args::BackendArg;
use crate::cmd::CmdLineRunner;
use crate::config::Settings;
use crate::http::HTTP_FETCH;
use crate::toolset::ToolVersionOptions;
use crate::{backend::Backend, config::Config};
use async_trait::async_trait;
use eyre::eyre;
use jiff::Timestamp;

/// Dotnet backend requires experimental mode to be enabled
pub const EXPERIMENTAL: bool = true;
Expand Down Expand Up @@ -36,18 +40,16 @@ impl Backend for DotnetBackend {
true
}

async fn _list_remote_versions(&self, _config: &Arc<Config>) -> eyre::Result<Vec<VersionInfo>> {
async fn _list_remote_versions(&self, config: &Arc<Config>) -> eyre::Result<Vec<VersionInfo>> {
let feed_url = self.get_search_url().await?;
let opts = self.tool_opts(config).await?;

let feed: NugetFeedSearch = HTTP_FETCH
.json(format!(
"{}?q={}&packageType=dotnettool&take=1&prerelease={}",
feed_url,
&self.tool_name(),
Settings::get()
.dotnet
.package_flags
.contains(&"prerelease".to_string())
self.dotnet_prereleases_enabled(&opts)
))
.await?;

Expand All @@ -72,6 +74,53 @@ impl Backend for DotnetBackend {
.collect())
}

/// Bypass the shared remote-versions cache because the dotnet package flags
/// affect which versions NuGet returns. The override is on `_with_refresh`
/// so install-time latest resolution uses the same dotnet-specific
/// prerelease filtering as `ls-remote`.
async fn list_remote_versions_with_info_with_refresh(
&self,
config: &Arc<Config>,
_refresh: bool,
) -> eyre::Result<Vec<VersionInfo>> {
let opts = self.tool_opts(config).await?;
let want_prereleases = self.dotnet_prereleases_enabled(&opts);
let versions = self
._list_remote_versions(config)
.await?
.into_iter()
.map(mark_prerelease)
.collect();
Ok(filter_cached_prereleases(versions, want_prereleases))
Comment thread
cursor[bot] marked this conversation as resolved.
}
Comment thread
cursor[bot] marked this conversation as resolved.

async fn list_versions_matching_with_opts(
&self,
config: &Arc<Config>,
query: &str,
before_date: Option<Timestamp>,
refresh: bool,
) -> eyre::Result<Vec<String>> {
let versions = match before_date {
Some(before) => {
let versions_with_info = self
.list_remote_versions_with_info_with_refresh(config, refresh)
.await?;
VersionInfo::filter_by_date(versions_with_info, before)
.into_iter()
.map(|v| v.version)
.collect()
}
None => {
self.list_remote_versions_with_refresh(config, refresh)
.await?
}
};
let opts = self.tool_opts(config).await?;
let filter = !self.dotnet_prereleases_enabled(&opts);
Ok(self.fuzzy_match_filter(versions, query, filter))
}

async fn install_version_(
&self,
ctx: &crate::install_context::InstallContext,
Expand Down Expand Up @@ -134,6 +183,22 @@ impl DotnetBackend {

Ok(feed.id.clone())
}

async fn tool_opts(&self, config: &Arc<Config>) -> eyre::Result<ToolVersionOptions> {
Ok(config
.get_tool_opts(&self.ba)
.await?
.unwrap_or_else(|| self.ba.opts()))
}

fn dotnet_prereleases_enabled(&self, opts: &ToolVersionOptions) -> bool {
Settings::get().prereleases
|| Settings::get()
.dotnet
.package_flags
.contains(&"prerelease".to_string())
|| include_prereleases(opts)
}
}

#[derive(serde::Deserialize)]
Expand Down
Loading