From 139bd51c90828786aa8ed2ec1a050a0463d91995 Mon Sep 17 00:00:00 2001
From: Sergey Bykov <sbykov@microsoft.com>
Date: Mon, 14 Dec 2015 09:52:06 -0800
Subject: [PATCH] Replaced references to
 Microsoft.Framework.DependencyInjection.* with
 Microsoft.Extensions.DependencyInjection. Updated the version from 1.0.10 to
 1.1.0.

---
 src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj   | 8 ++++----
 .../OrleansVSTools/source.extension.vsixmanifest          | 6 +++---
 .../VSProjectSiloHost/VSProjectSiloHost.vstemplate        | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj b/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj
index 4e6336d9d8..9004d152ce 100644
--- a/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj
+++ b/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj
@@ -227,12 +227,12 @@
       <Link>Packages\Microsoft.CodeAnalysis.CSharp.1.0.0.nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\..\packages\Microsoft.Framework.DependencyInjection.1.0.0-beta8\Microsoft.Framework.DependencyInjection.1.0.0-beta8.nupkg">
-      <Link>Packages\Microsoft.Framework.DependencyInjection.1.0.0-beta8.nupkg</Link>
+    <Content Include="..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-final\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-final.nupkg">
+      <Link>Packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-final.nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\..\packages\Microsoft.Framework.DependencyInjection.Abstractions.1.0.0-beta8\Microsoft.Framework.DependencyInjection.Abstractions.1.0.0-beta8.nupkg">
-      <Link>Packages\Microsoft.Framework.DependencyInjection.Abstractions.1.0.0-beta8.nupkg</Link>
+    <Content Include="..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-final\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-final.nupkg">
+      <Link>Packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-final.nupkg</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="..\..\packages\Newtonsoft.Json.6.0.8\Newtonsoft.Json.6.0.8.nupkg">
diff --git a/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest b/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest
index 056569b034..dda6efedad 100644
--- a/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest
+++ b/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="462db41f-31a4-48f0-834c-1bdcc0578511" Version="1.0.10" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="462db41f-31a4-48f0-834c-1bdcc0578511" Version="1.1.0" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Microsoft Orleans Tools for Visual Studio</DisplayName>
     <Description xml:space="preserve">Microsoft Orleans Tools for Visual Studio 2012, 2013, 2015
 C#, VB, F#  Project templates and item templates
@@ -42,8 +42,8 @@ C#, VB, F#  Project templates and item templates
     <Asset Type="Microsoft.CodeAnalysis.Analyzers.1.0.0.nupkg" d:Source="File" Path="Packages\Microsoft.CodeAnalysis.Analyzers.1.0.0.nupkg" d:VsixSubPath="Packages" /> 
     <Asset Type="Microsoft.CodeAnalysis.Common.1.0.0.nupkg" d:Source="File" Path="Packages\Microsoft.CodeAnalysis.Common.1.0.0.nupkg" d:VsixSubPath="Packages" /> 
     <Asset Type="Microsoft.CodeAnalysis.CSharp.1.0.0.nupkg" d:Source="File" Path="Packages\Microsoft.CodeAnalysis.CSharp.1.0.0.nupkg" d:VsixSubPath="Packages" /> 
-    <Asset Type="Microsoft.Framework.DependencyInjection.1.0.0-beta8.nupkg" d:Source="File" Path="Packages\Microsoft.Framework.DependencyInjection.1.0.0-beta8.nupkg" d:VsixSubPath="Packages" /> 
-    <Asset Type="Microsoft.Framework.DependencyInjection.Abstractions.1.0.0-beta8.nupkg" d:Source="File" Path="Packages\Microsoft.Framework.DependencyInjection.Abstractions.1.0.0-beta8.nupkg" d:VsixSubPath="Packages" /> 
+    <Asset Type="Microsoft.Extensions.DependencyInjection.1.0.0-rc1-final.nupkg" d:Source="File" Path="Packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc1-final.nupkg" d:VsixSubPath="Packages" /> 
+    <Asset Type="Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-final" d:Source="File" Path="Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc1-final" d:VsixSubPath="Packages" /> 
     <Asset Type="Microsoft.Orleans.Core.1.1.0.nupkg" d:Source="File" Path="Packages\Microsoft.Orleans.Core.1.1.0.nupkg" d:VsixSubPath="Packages" /> 
     <Asset Type="Microsoft.Orleans.CounterControl.1.1.0.nupkg" d:Source="File" Path="Packages\Microsoft.Orleans.CounterControl.1.1.0.nupkg" d:VsixSubPath="Packages" /> 
     <Asset Type="Microsoft.Orleans.OrleansCodeGenerator.1.1.0.nupkg" d:Source="File" Path="Packages\Microsoft.Orleans.OrleansCodeGenerator.1.1.0.nupkg" d:VsixSubPath="Packages" /> 
diff --git a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate
index 908c23a425..348c4f4b00 100644
--- a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate
+++ b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate
@@ -33,8 +33,8 @@
       <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" />
       <package id="Microsoft.CodeAnalysis.Common" version="1.0.0" />
       <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" />
-      <package id="Microsoft.Framework.DependencyInjection" version="1.0.0-beta8" />
-      <package id="Microsoft.Framework.DependencyInjection.Abstractions" version="1.0.0-beta8" />
+      <package id="Microsoft.Extensions.DependencyInjection" version="1.0.0-rc1-final" />
+      <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0-rc1-final" />
       <package id="Microsoft.Orleans.Core" version="1.1.0" />
       <package id="Microsoft.Orleans.CounterControl" version="1.1.0" />
       <package id="Microsoft.Orleans.OrleansCodeGenerator" version="1.1.0" />