Merge #539v0.6.0-rc.2

539: Prepare rc.2 release r=AfoHT a=korken89



Co-authored-by: Emil Fresk <emil.fresk@gmail.com>

3 files changed, 7 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9359a5f1..61e12556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.6.0-rc.2] - 2021-09-28
+
+- Fixed issue with `cortex_m` being used by the codegen instead of using the `rtic::export::...` which could make an app not compile if Systick is used and the user did not have the cortex-m crate as a dependency
+
 ## [v0.6.0-rc.1] - 2021-09-27
 
 - Documentation updates
diff --git a/Cargo.toml b/Cargo.toml
index c73e3c87..3f32a80e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,14 +14,14 @@ name = "cortex-m-rtic"
 readme = "README.md"
 repository = "https://github.com/rtic-rs/cortex-m-rtic"
 
-version = "0.6.0-rc.1"
+version = "0.6.0-rc.2"
 
 [lib]
 name = "rtic"
 
 [dependencies]
 cortex-m = "0.7.0"
-cortex-m-rtic-macros = { path = "macros", version = "0.6.0-rc.1" }
+cortex-m-rtic-macros = { path = "macros", version = "0.6.0-rc.2" }
 rtic-monotonic = "0.1.0-rc.1"
 rtic-core = "0.3.1"
 heapless = "0.7.7"
diff --git a/macros/Cargo.toml b/macros/Cargo.toml
index 4de1e3e4..986e22b0 100644
--- a/macros/Cargo.toml
+++ b/macros/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m-rtic-macros"
 readme = "../README.md"
 repository = "https://github.com/rtic-rs/cortex-m-rtic"
-version = "0.6.0-rc.1"
+version = "0.6.0-rc.2"
 
 [lib]
 proc-macro = true