2 files changed, 16 insertions, 3 deletions

diff --git a/xtask/src/install.rs b/xtask/src/install.rs
index 1d13b26da..f76467cac 100644
--- a/xtask/src/install.rs
+++ b/xtask/src/install.rs
@@ -122,7 +122,8 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
     if !installed_extensions.contains("rust-analyzer") {
         bail!(
             "Could not install the Visual Studio Code extension. \
-             Please make sure you have at least NodeJS 12.x together with the latest version of VS Code installed and try again."
+            Please make sure you have at least NodeJS 12.x together with the latest version of VS Code installed and try again. \
+            Note that installing via xtask install does not work for VS Code Remote, instead you’ll need to install the .vsix manually."
         );
     }
 
diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index e5da726ac..f48045d17 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -139,12 +139,15 @@ pub fn run_pre_cache() -> Result<()> {
     }
 
     fs2::remove_file("./target/.rustc_info.json")?;
-    let to_delete = ["ra_", "heavy_test"];
+    let to_delete = ["ra_", "heavy_test", "xtask"];
     for &dir in ["./target/debug/deps", "target/debug/.fingerprint"].iter() {
         for entry in Path::new(dir).read_dir()? {
             let entry = entry?;
             if to_delete.iter().any(|&it| entry.path().display().to_string().contains(it)) {
-                rm_rf(&entry.path())?
+                // Can't delete yourself on windows :-(
+                if !entry.path().ends_with("xtask.exe") {
+                    rm_rf(&entry.path())?
+                }
             }
         }
     }
@@ -192,5 +195,14 @@ Release: release:{}[]
 
     fs2::copy(project_root().join("./docs/user/readme.adoc"), website_root.join("manual.adoc"))?;
 
+    let tags = run!("git tag --list"; echo = false)?;
+    let prev_tag = tags.lines().filter(|line| is_release_tag(line)).last().unwrap();
+
+    println!("\n    git log {}..HEAD --merges --reverse", prev_tag);
+
     Ok(())
 }
+
+fn is_release_tag(tag: &str) -> bool {
+    tag.len() == "2020-02-24".len() && tag.starts_with(|c: char| c.is_ascii_digit())
+}