diff --git a/build/dependencies.props b/build/dependencies.props index b64a798b78..756d48feb4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -29,10 +29,10 @@ 1.1.0 2.1.0-preview1-27644 2.0.0 - 2.1.0-preview1-25907-02 + 2.1.0-preview1-25915-01 2.6.0-beta2-62211-02 15.3.0 - 4.4.0 + 4.5.0-preview1-25914-04 0.1.0-alpha-002 10.0.10586 4.5.0-preview1-25902-08 @@ -42,10 +42,8 @@ 0.1.0-alpha-002 2.3.0 2.3.0 - 7.0.0 2.0.0 - diff --git a/korebuild-lock.txt b/korebuild-lock.txt index fe4a961da3..bd5633da7c 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,7 @@ +<<<<<<< HEAD version:2.1.0-preview1-15620 commithash:6432b49a2c00310416df39b6fe548ef4af9c6011 +======= +version:2.1.0-preview1-15618 +commithash:00ce1383114015fe89b221146036e59e6bc11219 +>>>>>>> 0dae9f5... Update dependencies.props