microsoft
/
RTVS
зеркало из https://github.com/microsoft/RTVS.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #4248 from AlexanderSher/net471 

Move to net471 + fix VS discovery in unit tests
This commit is contained in:
Alexander Sher 2017-12-15 16:40:55 -06:00 коммит произвёл GitHub
Родитель a2b0143f29 f654ba3f0a
Коммит b31ffe0c9d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
79 изменённых файлов: 212 добавлений и 483 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
linux-nuget.config
Просмотреть файл

@ -8,8 +8,8 @@
</activePackageSource>
<packageSources>
<add key="NuGet V3" value="https://api.nuget.org/v3/index.json" />
<add key="VS DevCore" value="https://www.myget.org/F/vs-devcore/api/v3/index.json" />
<add key="VS Editor" value="https://www.myget.org/F/vs-editor/api/v3/index.json" />
<add key="VS SDK" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
<add key="VS SDK Internal" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
<add key="VS IW" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
</packageSources>
</configuration>

10
nuget.config
Просмотреть файл

@ -9,13 +9,7 @@
<packageSources>
<add key="VS IW" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
<add key="NuGet V3" value="https://api.nuget.org/v3/index.json" />
<add key="VS Internal" value="https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/VS/nuget/v3/index.json" />
<add key="RTVS Internal" value="https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/RTVS-pr/nuget/v3/index.json" />
<add key="VS DevCore" value="https://www.myget.org/F/vs-devcore/api/v3/index.json" />
<add key="VS Editor" value="https://www.myget.org/F/vs-editor/api/v3/index.json" />
<add key="VS SDK" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
<add key="VS SDK Internal" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
</packageSources>
<disabledPackageSources>
<add key="VS Internal" value="true" />
<add key="RTVS Internal" value="true" />
</disabledPackageSources>
</configuration>

3
src/Common/Core/Test/Microsoft.Common.Core.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
<RootNamespace>Microsoft.Common.Core.Test</RootNamespace>
<AssemblyName>Microsoft.R.Common.Core.Test</AssemblyName>
</PropertyGroup>
@ -21,7 +21,6 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171031-01" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />

3
src/Containers/Impl/Microsoft.R.Containers.csproj
Просмотреть файл

@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFramework>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netstandard2.0;net461</TargetFrameworks>
<TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Microsoft.R.Containers</AssemblyName>
</PropertyGroup>
<Import Project="..\..\R.Settings.NetCore.props" />

2
src/Host/API/Impl/Microsoft.R.Host.Client.API.csproj
Просмотреть файл

@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Host.Client</RootNamespace>
<AssemblyName>Microsoft.R.Host.Client.API</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>

2
src/Host/API/Impl/project.json
Просмотреть файл

@ -5,7 +5,7 @@
"NuGet.CommandLine": "3.5.0"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

2
src/Host/API/Test/Microsoft.R.Host.Client.API.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Host.Client.API.Test</RootNamespace>
<AssemblyName>Microsoft.R.Host.Client.API.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

3
src/Host/Broker/Impl/Microsoft.R.Host.Broker.csproj
Просмотреть файл

@ -20,7 +20,7 @@
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.0" />
@ -37,7 +37,6 @@
<PackageReference Include="System.Net.NetworkInformation" Version="4.3.0" />
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.1" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />
</ItemGroup>
<ItemGroup>

2
src/Host/Protocol/Test/Microsoft.R.Host.Protocol.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Host.Protocol.Test</RootNamespace>
<AssemblyName>Microsoft.R.Host.Protocol.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

2
src/Host/Protocol/Test/project.json
Просмотреть файл

@ -6,7 +6,7 @@
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

12
src/Host/UserProfile/Impl/App.config
Просмотреть файл

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
<system.serviceModel>
<behaviors>
<serviceBehaviors>
<behavior name="">
<serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" />
<serviceDebug includeExceptionDetailInFaults="false" />
<serviceMetadata httpGetEnabled="true" httpsGetEnabled="true"/>
<serviceDebug includeExceptionDetailInFaults="false"/>
</behavior>
</serviceBehaviors>
</behaviors>
@ -16,13 +16,13 @@
<service name="Microsoft.R.Host.UserProfile.UserProfileManager">
<endpoint address="" binding="basicHttpBinding" contract="Microsoft.R.Host.UserProfile.IUserProfileManager">
<identity>
<dns value="localhost" />
<dns value="localhost"/>
</identity>
</endpoint>
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
<endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
<host>
<baseAddresses>
<add baseAddress="http://localhost:8733/Design_Time_Addresses/Microsoft.R.Host.UserProfile/UserProfileManager/" />
<add baseAddress="http://localhost:8733/Design_Time_Addresses/Microsoft.R.Host.UserProfile/UserProfileManager/"/>
</baseAddresses>
</host>
</service>

2
src/Host/UserProfile/Impl/Microsoft.R.Host.UserProfile.csproj
Просмотреть файл

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Host.UserProfile</RootNamespace>
<AssemblyName>Microsoft.R.Host.UserProfile</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />

2
src/Host/UserProfile/Impl/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -19,7 +19,7 @@ namespace Microsoft.R.Host.UserProfile {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {

2
src/Host/UserProfile/Impl/project.json
Просмотреть файл

@ -11,7 +11,7 @@
"System.Net.Http": "4.3.3"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {},

2
src/Languages/Core/Test/Microsoft.Languages.Core.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
<RootNamespace>Microsoft.Languages.Core.Test</RootNamespace>
<AssemblyName>Microsoft.Languages.Core.Test</AssemblyName>
</PropertyGroup>

83
src/Package/Impl/Microsoft.VisualStudio.R.Package.csproj
Просмотреть файл

@ -26,7 +26,7 @@
<ProjectTypeGuids>{82B43B9B-A64C-4715-B499-D71E9CA2BD60};{60DC8134-EBA5-43B8-BCC9-BB4BC16C2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{26035FE3-25AB-45EC-BB45-7FD0B6C1D545}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<GeneratePkgDefFile>true</GeneratePkgDefFile>
<UseCodebase>true</UseCodebase>
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
@ -1474,7 +1474,6 @@
<Import Project="..\..\Common\BuildTasks\Microsoft.Common.BuildTasks.targets" />
<Target Name="AddToVsixSources" AfterTargets="GetVsixSourceItems">
<ItemGroup>
<VSIXSourceItem Include="$(OutputPath)\netstandard.dll" />
<VSIXSourceItem Include="$(OutputPath)\Markdig.dll" />
<VSIXSourceItem Include="$(OutputPath)\Newtonsoft.Json.dll" />
<VSIXSourceItem Include="$(OutputPath)\YamlDotNet.dll" />
@ -1602,113 +1601,33 @@
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\Microsoft.Net.Http.Headers.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\Microsoft.Net.Http.Server.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\Microsoft.Win32.Registry.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\Microsoft.Win32.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.AppContext.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Buffers.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Collections.Concurrent.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Collections.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Collections.Immutable.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Collections.NonGeneric.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Collections.Specialized.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.ComponentModel.Annotations.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.ComponentModel.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.ComponentModel.EventBasedAsync.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.ComponentModel.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.ComponentModel.TypeConverter.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Console.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Data.Common.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.Contracts.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.Debug.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.DiagnosticSource.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.FileVersionInfo.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.Process.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.StackTrace.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.TextWriterTraceListener.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.Tools.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Diagnostics.Tracing.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Drawing.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Dynamic.Runtime.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Globalization.Calendars.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Globalization.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Globalization.Extensions.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.Compression.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.Compression.ZipFile.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.FileSystem.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.FileSystem.DriveInfo.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.FileSystem.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.FileSystem.Watcher.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.IsolatedStorage.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.MemoryMappedFiles.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.Pipes.AccessControl.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.Pipes.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.IO.UnmanagedMemoryStream.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.linq.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.linq.Expressions.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.linq.Parallel.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.linq.Queryable.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.Http.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.Http.WinHttpHandler.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.NameResolution.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.NetworkInformation.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.Ping.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.Requests.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.Security.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.Sockets.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.WebHeaderCollection.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.WebSockets.Client.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Net.WebSockets.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Numerics.Vectors.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.ObjectModel.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Reflection.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Reflection.Metadata.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Reflection.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Resources.Reader.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Resources.ResourceManager.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Resources.Writer.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.CompilerServices.Unsafe.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.Extensions.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.Handles.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.InteropServices.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.InteropServices.RuntimeInformation.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.Numerics.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.Serialization.Formatters.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.Serialization.Json.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.Serialization.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Runtime.Serialization.Xml.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.AccessControl.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Claims.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Cryptography.Algorithms.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Cryptography.Csp.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Cryptography.Encoding.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Cryptography.Primitives.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Cryptography.X509Certificates.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Cryptography.Xml.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Principal.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.Principal.Windows.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Security.SecureString.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Text.Encoding.CodePages.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Text.Encoding.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Text.Encoding.Extensions.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Text.Encodings.Web.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Text.RegularExpressions.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.Overlapped.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.Tasks.Dataflow.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.Tasks.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.Tasks.Extensions.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.Tasks.Parallel.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.Thread.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.ThreadPool.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Threading.Timer.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.ValueTuple.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Xml.ReaderWriter.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Xml.XDocument.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Xml.XmlDocument.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Xml.XmlSerializer.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Xml.XPath.dll" />
<VSIXSourceItem Include="$(OutputPath)\Broker\Windows\System.Xml.XPath.XDocument.dll" />
<VSIXSourceItem Include="$(OutputPath)\Markdown\PreviewTemplate.html" />
<VSIXSourceItem Include="$(OutputPath)\Dockerfile">

4
src/Package/Impl/Properties/AssemblyInfo.cs
Просмотреть файл

@ -4,10 +4,6 @@
using Microsoft.VisualStudio.Shell;
using System.Runtime.CompilerServices;
[assembly: ProvideBindingRedirection(AssemblyName = "System.ValueTuple",
OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "4.0.2.0", NewVersion = "4.0.2.0")]
[assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.Win32.Primitives",
OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "4.0.3.0", NewVersion = "4.0.3.0")]
[assembly: ProvideBindingRedirection(AssemblyName = "System.Net.Http",
OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "4.2.0.0", NewVersion = "4.2.0.0")]

11
src/Package/Impl/project.json
Просмотреть файл

@ -21,10 +21,10 @@
"Microsoft.VisualStudio.Shell.Interop.11.0": "11.0.61030",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime": "15.0.26201",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"Microsoft.VisualStudio.TextManager.Interop.12.0": "12.0.30110",
"Microsoft.VisualStudio.VsInteractiveWindow": "2.3.0",
"Microsoft.VSSDK.BuildTools": "15.5.72",
@ -33,11 +33,10 @@
"System.IO.Compression.ZipFile": "4.3.0",
"System.Net.Http.WinHttpHandler": "4.4.0",
"System.Threading.Tasks.Dataflow": "4.8.0",
"System.ValueTuple": "4.4.0",
"VSSDK.DTE.8": "8.0.4"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

2
src/Package/Test/Microsoft.VisualStudio.R.Package.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.VisualStudio.R.Package.Test</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.R.Package.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>

12
src/Package/Test/project.json
Просмотреть файл

@ -4,17 +4,17 @@
"MicroBuild.Core": "0.2.0",
"Microsoft.SqlServer.DacFx.x86": "140.3745.1",
"Microsoft.VisualStudio.ComponentModelHost": "15.4.27004",
"Microsoft.VisualStudio.Editor": "15.4.27004",
"Microsoft.VisualStudio.Editor": "15.6.241-preview",
"Microsoft.VisualStudio.ImageCatalog": "15.4.27004",
"Microsoft.VisualStudio.InteractiveWindow": "2.3.0",
"Microsoft.VisualStudio.ProjectSystem": "15.5.293-pre",
"Microsoft.VisualStudio.SDK.EmbedInteropTypes": "15.0.12",
"Microsoft.VisualStudio.Shell.Interop.11.0": "11.0.61030",
"Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime": "15.0.25726-Preview5",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"Microsoft.VisualStudio.TextManager.Interop.12.0": "12.0.30110",
"Microsoft.VisualStudio.VsInteractiveWindow": "2.3.0",
"NSubstitute": "3.1.0",
@ -24,7 +24,7 @@
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

2
src/Package/TestApp/Microsoft.VisualStudio.R.Interactive.Test.csproj
Просмотреть файл

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.VisualStudio.R.Interactive.Test</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.R.Interactive.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>

12
src/Package/TestApp/project.json
Просмотреть файл

@ -2,16 +2,16 @@
"dependencies": {
"FluentAssertions": "4.19.4",
"MicroBuild.Core": "0.2.0",
"Microsoft.VisualStudio.Editor": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Microsoft.VisualStudio.Editor": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

2
src/ProjectSystem/Impl/Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring</AssemblyName>
</PropertyGroup>

2
src/ProjectSystem/Test/Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Test</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.ProjectSystem.FileSystemMirroring.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

2
src/ProjectSystem/Test/project.json
Просмотреть файл

@ -12,7 +12,7 @@
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

2
src/R.Settings.NetCore.props
Просмотреть файл

@ -16,7 +16,7 @@
<DebugType>portable</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net471'">
<Desktop>true</Desktop>
<DefineConstants>DESKTOP;$(DefineConstants)</DefineConstants>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

4
src/R.sln
Просмотреть файл

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27107.1
VisualStudioVersion = 15.0.27130.2003
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.R.Package", "Package\Impl\Microsoft.VisualStudio.R.Package.csproj", "{26035FE3-25AB-45EC-BB45-7FD0B6C1D545}"
ProjectSection(ProjectDependencies) = postProject
@ -114,7 +114,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Shel
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.R.Debugger", "Windows\Debugger\Impl\Microsoft.R.Debugger.csproj", "{6D62DF0D-D9C3-49A7-A693-ACD0691BA69D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Languages.Editor.Application", "Windows\EditorTestApp\Microsoft.Languages.Editor.Application.csproj", "{9174C912-E757-4ECD-9D6E-9604BEF74900}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Languages.Editor.Application", "Windows\EditorTestApp\Microsoft.Languages.Editor.Application.csproj", "{9174C912-E757-4ECD-9D6E-9604BEF74900}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VSCode", "VSCode", "{59FAA332-8D85-4D19-97F2-532A840131C9}"
EndProject

2
src/R/Components/Test/Microsoft.R.Components.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
<RootNamespace>Microsoft.R.Components.Test</RootNamespace>
<AssemblyName>Microsoft.R.Components.Test</AssemblyName>
</PropertyGroup>

5
src/R/Core/Test/Microsoft.R.Core.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
<RootNamespace>Microsoft.R.Core.Test</RootNamespace>
<AssemblyName>Microsoft.R.Core.Test</AssemblyName>
</PropertyGroup>
@ -30,6 +30,9 @@
<ProjectReference Include="$(SourceDirectory)UnitTests\Core\Impl\Microsoft.UnitTests.Core.csproj" />
<ProjectReference Include="..\..\Core\Impl\Microsoft.R.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="$(SourceDirectory)R.Build.Version.targets" />
<Import Project="$(SourceDirectory)R.Build.Sign.targets" />

5
src/R/Editor/Impl/Validation/ValidatorAggregator.cs
Просмотреть файл

@ -24,14 +24,13 @@ namespace Microsoft.R.Editor.Validation {
private TaskCompletionSource<bool> _tcs;
public ValidatorAggregator(IServiceContainer services) {
var services1 = services;
_settings = services1.GetService<IREditorSettings>();
_settings = services.GetService<IREditorSettings>();
// Populate known validators
var list = new List<IRDocumentValidator>() { new LintValidator() };
// Fetch externally provided ones
var locator = services1.GetService<IContentTypeServiceLocator>();
var locator = services.GetService<IContentTypeServiceLocator>();
list.AddRange(locator.GetAllServices<IRDocumentValidator>("R"));
_validators = list;

2
src/R/Wpf/Impl/Microsoft.R.Wpf.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.R.Wpf</RootNamespace>
<AssemblyName>Microsoft.R.Wpf</AssemblyName>
</PropertyGroup>

4
src/UnitTests/Core/Impl/Microsoft.UnitTests.Core.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
<TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
<AssemblyName>Microsoft.UnitTests.Core</AssemblyName>
<RootNamespace>Microsoft.UnitTests.Core</RootNamespace>
</PropertyGroup>
@ -20,9 +20,7 @@
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171031-01" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="xunit" Version="2.3.1" />
</ItemGroup>

2
src/UnitTests/Microsoft.VSIntegrationTests/Microsoft.VSIntegrationTests.csproj
Просмотреть файл

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.VSIntegrationTests</RootNamespace>
<AssemblyName>Microsoft.VSIntegrationTests</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>

4
src/UnitTests/app.config
Просмотреть файл

@ -70,10 +70,6 @@
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

2
src/VsCode/Extension/VsCode.R.Extension.csproj
Просмотреть файл

@ -11,7 +11,7 @@
<AssemblyName>Microsoft.VsCode.R.Extension</AssemblyName>
<PackageName>r-0.0.1</PackageName>
<OutputType>Library</OutputType>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>

2
src/VsCode/Extension/project.json
Просмотреть файл

@ -3,7 +3,7 @@
"MicroBuild.Core": "0.2.0"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

1
src/VsCode/LanguageServer/Impl/Microsoft.R.LanguageServer.csproj
Просмотреть файл

@ -24,7 +24,6 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
<PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SourceDirectory)Common\Core\Impl\Microsoft.R.Common.Core.csproj" />

3
src/VsCode/LanguageServer/Impl/Services/ServiceContainer.cs
Просмотреть файл

@ -4,7 +4,6 @@
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.Loader;
using System.Text;
using System.Threading;
using Microsoft.Common.Core;
@ -60,7 +59,7 @@ namespace Microsoft.R.LanguageServer.Services {
var thisAssemblyPath = thisAssembly.GetAssemblyPath();
var assemblyLoc = Path.GetDirectoryName(thisAssemblyPath);
var platformServicesAssemblyPath = Path.Combine(assemblyLoc, platformAssemblyName);
assembly = AssemblyLoadContext.Default.LoadFromAssemblyPath(platformServicesAssemblyPath);
assembly = Assembly.LoadFrom(platformServicesAssemblyPath);
}
var classType = assembly.GetType("Microsoft.R.Platform.ServiceProvider");

2
src/Windows/Containers/Impl/Microsoft.R.Containers.Windows.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.R.Containers</RootNamespace>
<AssemblyName>Microsoft.R.Containers.Windows</AssemblyName>
</PropertyGroup>

2
src/Windows/Containers/Test/Microsoft.R.Containers.Windows.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Containers.Windows.Test</RootNamespace>
<AssemblyName>Microsoft.R.Containers.Windows.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>

2
src/Windows/Containers/Test/project.json
Просмотреть файл

@ -7,7 +7,7 @@
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

4
src/Windows/Debugger/Impl/Microsoft.R.Debugger.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.R.Debugger</RootNamespace>
<AssemblyName>Microsoft.R.Debugger</AssemblyName>
</PropertyGroup>
@ -25,7 +25,7 @@
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="10.0.30319" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />

16
src/Windows/Editor/Impl/Microsoft.Languages.Editor.Windows.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.Languages.Editor</RootNamespace>
<AssemblyName>Microsoft.Languages.Editor.Windows</AssemblyName>
</PropertyGroup>
@ -24,15 +24,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="15.0.25726-Preview5" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SourceDirectory)Common\Core\Impl\Microsoft.R.Common.Core.csproj" />

2
src/Windows/Editor/Test/Microsoft.Languages.Editor.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Languages.Editor.Test</RootNamespace>
<AssemblyName>Microsoft.Languages.Editor.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

13
src/Windows/Editor/Test/project.json
Просмотреть файл

@ -2,16 +2,17 @@
"dependencies": {
"FluentAssertions": "4.19.4",
"MicroBuild.Core": "0.2.0",
"Microsoft.VisualStudio.Editor": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Microsoft.VisualStudio.Editor": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"NSubstitute": "3.1.0",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

139
src/Windows/EditorTestApp/Microsoft.Languages.Editor.Application.csproj
Просмотреть файл

@ -1,125 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9174C912-E757-4ECD-9D6E-9604BEF74900}</ProjectGuid>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.Languages.Editor.Application</RootNamespace>
<OutputType>Library</OutputType>
<AssemblyName>Microsoft.Languages.Editor.Application</AssemblyName>
</PropertyGroup>
<Import Project="..\..\R.Settings.NetCore.props" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<Import Project="..\..\R.Settings.props" />
<PropertyGroup>
<BaseIntermediateOutputPath>$(ObjDirectory)</BaseIntermediateOutputPath>
<BaseOutputPath>$(BinDirectory)</BaseOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)\Microsoft.Languages.Editor.Application\</IntermediateOutputPath>
<OutputPath>$(BaseOutputPath)\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
<DebugType>portable</DebugType>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\AssemblyVersionInfo.cs">
<Link>Properties\AssemblyVersionInfo.cs</Link>
</Compile>
<Compile Include="..\..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Composition\ContentTypeLocator.cs" />
<Compile Include="Controller\BaseController.cs" />
<Compile Include="Controller\BraceCompletionCommandTarget.cs" />
<Compile Include="Controller\DefaultKeyStrokeProcessor.cs" />
<Compile Include="Controller\DefaultKeyStrokeProcessorProvider.cs" />
<Compile Include="Controller\KeyToCommandMapping.cs" />
<Compile Include="Core\CoreEditor.cs" />
<Compile Include="Core\DefaultTextViewRoleSet.cs" />
<Compile Include="Core\TextDataModel.cs" />
<Compile Include="Core\TextViewRoleSet.cs" />
<Compile Include="Host\EditorViewModelFactory.cs" />
<Compile Include="Packages\MarkdownPackage.cs" />
<Compile Include="Packages\TextPackage.cs" />
<Compile Include="Packages\RPackage.cs" />
<Compile Include="Packages\SettingsStorage.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Snippets\SnippetInformationSource.cs" />
<Compile Include="Snippets\SnippetInformationSourceProvider.cs" />
<Compile Include="$(SourceDirectory)GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
<Compile Include="$(SourceDirectory)AssemblyVersionInfo.cs" Link="Properties\AssemblyVersionInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Core\Impl\Microsoft.R.Common.Core.csproj">
<Project>{C2A86AAB-A537-418D-A1EF-14540D340CB1}</Project>
<Name>Microsoft.R.Common.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\Languages\Core\Impl\Microsoft.Languages.Core.csproj">
<Project>{25cd8690-6208-4740-b123-6dbce6b9444a}</Project>
<Name>Microsoft.Languages.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\Languages\Editor\Impl\Microsoft.Languages.Editor.csproj">
<Project>{62857e49-e586-4baa-ae4d-1232093e7378}</Project>
<Name>Microsoft.Languages.Editor</Name>
</ProjectReference>
<ProjectReference Include="..\..\R\Components\Impl\Microsoft.R.Components.csproj">
<Project>{c6648f60-513a-4052-9a34-61b156058ec3}</Project>
<Name>Microsoft.R.Components</Name>
</ProjectReference>
<ProjectReference Include="..\..\R\Core\Impl\Microsoft.R.Core.csproj">
<Project>{0c4bce1d-3cb8-4e2a-9252-58784d7f26a5}</Project>
<Name>Microsoft.R.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\R\Editor\Impl\Microsoft.R.Editor.csproj">
<Project>{ae67eba1-aff1-4425-8c89-4f0045a6bfd9}</Project>
<Name>Microsoft.R.Editor</Name>
</ProjectReference>
<ProjectReference Include="..\..\UnitTests\Core\Impl\Microsoft.UnitTests.Core.csproj">
<Project>{a930b6d8-2d2d-4047-a6ef-2522386877e3}</Project>
<Name>Microsoft.UnitTests.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Editor\Impl\Microsoft.Languages.Editor.Windows.csproj">
<Project>{d1895fa9-65f5-4048-a364-f6ab8d1dc981}</Project>
<Name>Microsoft.Languages.Editor.Windows</Name>
</ProjectReference>
<ProjectReference Include="..\Markdown\Editor\Impl\Microsoft.Markdown.Editor.Windows.csproj">
<Project>{98e0b8ac-1193-4bfd-bf5c-6712c93abd03}</Project>
<Name>Microsoft.Markdown.Editor.Windows</Name>
</ProjectReference>
<ProjectReference Include="..\R\Components\Impl\Microsoft.R.Components.Windows.csproj">
<Project>{506141BE-1418-4D75-8E24-54A9280B0A66}</Project>
<Name>Microsoft.R.Components.Windows</Name>
</ProjectReference>
<ProjectReference Include="..\R\Editor\Impl\Microsoft.R.Editor.Windows.csproj">
<Project>{d6eeef87-ce3a-4804-a409-39966b96c850}</Project>
<Name>Microsoft.R.Editor.Windows</Name>
</ProjectReference>
<ProjectReference Include="..\UnitTests\Core\Impl\Microsoft.UnitTests.Core.Windows.csproj">
<Project>{5ef2ad64-d6fe-446b-b350-8c7f0df0834d}</Project>
<Name>Microsoft.UnitTests.Core.Windows</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.Text.Internal.dll">
<Reference Include="Microsoft.VisualStudio.Text.Internal">
<Private>True</Private>
<HintPath>$(LibDirectory)\$(VisualStudioVersion)\Microsoft.VisualStudio.Text.Internal.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor">
<Private>True</Private>
<HintPath>$(LibDirectory)\$(VisualStudioVersion)\Microsoft.VisualStudio.Platform.VSEditor.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Platform.VSEditor.Interop">
<Private>True</Private>
<HintPath>$(LibDirectory)\$(VisualStudioVersion)\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171031-01" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Internal" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<ProjectReference Include="..\..\Common\Core\Impl\Microsoft.R.Common.Core.csproj" />
<ProjectReference Include="..\..\Languages\Core\Impl\Microsoft.Languages.Core.csproj" />
<ProjectReference Include="..\..\Languages\Editor\Impl\Microsoft.Languages.Editor.csproj" />
<ProjectReference Include="..\..\R\Components\Impl\Microsoft.R.Components.csproj" />
<ProjectReference Include="..\..\R\Core\Impl\Microsoft.R.Core.csproj" />
<ProjectReference Include="..\..\R\Editor\Impl\Microsoft.R.Editor.csproj" />
<ProjectReference Include="..\..\UnitTests\Core\Impl\Microsoft.UnitTests.Core.csproj" />
<ProjectReference Include="..\Editor\Impl\Microsoft.Languages.Editor.Windows.csproj" />
<ProjectReference Include="..\Markdown\Editor\Impl\Microsoft.Markdown.Editor.Windows.csproj" />
<ProjectReference Include="..\R\Components\Impl\Microsoft.R.Components.Windows.csproj" />
<ProjectReference Include="..\R\Editor\Impl\Microsoft.R.Editor.Windows.csproj" />
<ProjectReference Include="..\UnitTests\Core\Impl\Microsoft.UnitTests.Core.Windows.csproj" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
<Import Project="$(SourceDirectory)R.Build.Version.targets" />
<Import Project="$(SourceDirectory)R.Build.Sign.targets" />
</Project>
</Project>

19
src/Windows/EditorTestApp/project.json
Просмотреть файл

@ -1,19 +0,0 @@
{
"dependencies": {
"FluentAssertions": "4.19.4",
"MicroBuild.Core": "0.2.0",
"Microsoft.VisualStudio.Editor": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
},
"runtimes": {
"win": {}
}
}

3
src/Windows/Host/Broker/Impl/Microsoft.R.Host.Broker.Windows.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.R.Host.Broker</RootNamespace>
<AssemblyName>Microsoft.R.Host.Broker.Windows</AssemblyName>
<OutputType>Exe</OutputType>
@ -37,7 +37,6 @@
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SourceDirectory)Common\Core\Impl\Microsoft.R.Common.Core.csproj" />

5
src/Windows/Host/Broker/Impl/app.config
Просмотреть файл

@ -34,7 +34,6 @@
<assemblyIdentity name="Microsoft.AspNetCore.Http.Extensions" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Options" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
@ -71,12 +70,10 @@
<assemblyIdentity name="Microsoft.Extensions.Primitives" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Net.Http.Headers" culture="neutral" publicKeyToken="adb9793829ddae60" />
<bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" culture="neutral" publicKeyToken="b77a5c561934e089" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
@ -112,6 +109,6 @@
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>

2
src/Windows/Host/Client/Impl/Microsoft.R.Host.Client.Windows.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.R.Host.Client</RootNamespace>
<AssemblyName>Microsoft.R.Host.Client.Windows</AssemblyName>
</PropertyGroup>

2
src/Windows/Host/Client/Test/Microsoft.R.Host.Client.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Host.Client.Test</RootNamespace>
<AssemblyName>Microsoft.R.Host.Client.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

3
src/Windows/Host/Client/Test/project.json
Просмотреть файл

@ -2,11 +2,12 @@
"dependencies": {
"FluentAssertions": "4.19.4",
"MicroBuild.Core": "0.2.0",
"NSubstitute": "3.1.0",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

14
src/Windows/Markdown/Editor/Impl/Microsoft.Markdown.Editor.Windows.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.Markdown.Editor</RootNamespace>
<AssemblyName>Microsoft.Markdown.Editor.Windows</AssemblyName>
</PropertyGroup>
@ -29,12 +29,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="15.0.25726-Preview5" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />

2
src/Windows/Markdown/Editor/Test/Microsoft.Markdown.Editor.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.Markdown.Editor.Test</RootNamespace>
<AssemblyName>Microsoft.Markdown.Editor.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

12
src/Windows/Markdown/Editor/Test/project.json
Просмотреть файл

@ -2,16 +2,16 @@
"dependencies": {
"FluentAssertions": "4.19.4",
"MicroBuild.Core": "0.2.0",
"Microsoft.VisualStudio.Editor": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Microsoft.VisualStudio.Editor": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

16
src/Windows/Mocks/Editor/Microsoft.VisualStudio.Editor.Mocks.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.VisualStudio.Editor.Mocks</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.Editor.Mocks</AssemblyName>
</PropertyGroup>
@ -22,13 +22,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="15.0.25726-Preview5" />

16
src/Windows/Mocks/VisualStudio/Microsoft.VisualStudio.Shell.Mocks.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.VisualStudio.Shell.Mocks</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.Shell.Mocks</AssemblyName>
</PropertyGroup>
@ -29,13 +29,13 @@
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="EnvDTE" Version="8.0.1" />
<PackageReference Include="EnvDTE80" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.ImageCatalog" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.12" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="15.0.25726-Preview5" />

2
src/Windows/R/Components/Impl/Microsoft.R.Components.Windows.csproj
Просмотреть файл

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Components</RootNamespace>
<AssemblyName>Microsoft.R.Components.Windows</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>

13
src/Windows/R/Components/Impl/project.json
Просмотреть файл

@ -5,15 +5,14 @@
"Microsoft.VisualStudio.ImageCatalog": "15.4.27004",
"Microsoft.VisualStudio.Imaging": "15.4.27004",
"Microsoft.VisualStudio.InteractiveWindow": "2.3.0",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Newtonsoft.Json": "10.0.3",
"System.ValueTuple": "4.4.0"
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"Newtonsoft.Json": "10.0.3"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

11
src/Windows/R/Components/Test/Microsoft.R.Components.Windows.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
</PropertyGroup>
<Import Project="..\..\..\..\R.Settings.NetCore.props" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
@ -17,13 +17,12 @@
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171031-01" />
<PackageReference Include="Microsoft.VisualStudio.InteractiveWindow" Version="2.3.0" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.VsInteractiveWindow" Version="2.3.0" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />

2
src/Windows/R/Editor/Application.Test/Microsoft.R.Editor.Application.Test.csproj
Просмотреть файл

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Microsoft.R.Editor.Application.Test</AssemblyName>
<RootNamespace>Microsoft.R.Editor.Application.Test</RootNamespace>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup>

12
src/Windows/R/Editor/Application.Test/project.json
Просмотреть файл

@ -2,16 +2,16 @@
"dependencies": {
"FluentAssertions": "4.19.4",
"MicroBuild.Core": "0.2.0",
"Microsoft.VisualStudio.Editor": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Microsoft.VisualStudio.Editor": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

16
src/Windows/R/Editor/Impl/Microsoft.R.Editor.Windows.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.R.Editor</RootNamespace>
<AssemblyName>Microsoft.R.Editor.Windows</AssemblyName>
</PropertyGroup>
@ -26,13 +26,13 @@
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.CoreUtility" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.Logic" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI" Version="15.6.241-preview" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SourceDirectory)Common\Core\Impl\Microsoft.R.Common.Core.csproj" />

2
src/Windows/R/Editor/Test/Microsoft.R.Editor.Test.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.R.Editor.Test</RootNamespace>
<AssemblyName>Microsoft.R.Editor.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

3
src/Windows/R/Editor/Test/Validation/LinterTest.cs
Просмотреть файл

@ -2,6 +2,7 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.
using System.Collections.Concurrent;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Threading;
using System.Threading.Tasks;
@ -26,6 +27,8 @@ namespace Microsoft.R.Editor.Test.Roxygen {
public LinterTest(IServiceContainer services) {
_services = services;
Debugger.Launch();
_validator = new ValidatorAggregator(_services);
_options = _services.GetService<IREditorSettings>().LintOptions;
_options.Enabled = true;

12
src/Windows/R/Editor/Test/project.json
Просмотреть файл

@ -2,16 +2,16 @@
"dependencies": {
"FluentAssertions": "4.19.4",
"MicroBuild.Core": "0.2.0",
"Microsoft.VisualStudio.Editor": "15.4.27004",
"Microsoft.VisualStudio.Text.Data": "15.4.27004",
"Microsoft.VisualStudio.Text.Logic": "15.4.27004",
"Microsoft.VisualStudio.Text.UI": "15.4.27004",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.4.27004",
"Microsoft.VisualStudio.Editor": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Data": "15.6.241-preview",
"Microsoft.VisualStudio.Text.Logic": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI": "15.6.241-preview",
"Microsoft.VisualStudio.Text.UI.Wpf": "15.6.241-preview",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

3
src/Windows/R/Platform.Core/Test/Microsoft.R.Platform.Windows.Core.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
</PropertyGroup>
<Import Project="..\..\..\..\R.Settings.NetCore.props" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
@ -28,6 +28,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>

2
src/Windows/R/Platform.Desktop/Impl/Microsoft.R.Platform.Windows.Desktop.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<AssemblyName>Microsoft.R.Platform.Windows.Desktop</AssemblyName>
<RootNamespace>Microsoft.R.Platform</RootNamespace>
</PropertyGroup>

2
src/Windows/Setup/RHostRemote/project.json
Просмотреть файл

@ -3,7 +3,7 @@
"MicroBuild.Core": "0.2.0"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

79
src/Windows/Setup/RemoteServices/Assemblies.wxi
Просмотреть файл

@ -102,113 +102,34 @@
<File Source="$(var.BrokerBinDir)\Microsoft.Extensions.WebEncoders.dll" />
<File Source="$(var.BrokerBinDir)\Microsoft.Net.Http.Headers.dll" />
<File Source="$(var.BrokerBinDir)\Microsoft.Net.Http.Server.dll" />
<File Source="$(var.BrokerBinDir)\Microsoft.Win32.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\Microsoft.Win32.Registry.dll" />
<File Source="$(var.BrokerBinDir)\System.AppContext.dll" />
<File Source="$(var.BrokerBinDir)\System.Buffers.dll" />
<File Source="$(var.BrokerBinDir)\System.Collections.Concurrent.dll" />
<File Source="$(var.BrokerBinDir)\System.Collections.dll" />
<File Source="$(var.BrokerBinDir)\System.Collections.Immutable.dll" />
<File Source="$(var.BrokerBinDir)\System.Collections.NonGeneric.dll" />
<File Source="$(var.BrokerBinDir)\System.Collections.Specialized.dll" />
<File Source="$(var.BrokerBinDir)\System.ComponentModel.Annotations.dll" />
<File Source="$(var.BrokerBinDir)\System.ComponentModel.dll" />
<File Source="$(var.BrokerBinDir)\System.ComponentModel.EventBasedAsync.dll" />
<File Source="$(var.BrokerBinDir)\System.ComponentModel.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\System.ComponentModel.TypeConverter.dll" />
<File Source="$(var.BrokerBinDir)\System.Console.dll" />
<File Source="$(var.BrokerBinDir)\System.Data.Common.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.Contracts.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.Debug.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.DiagnosticSource.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.FileVersionInfo.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.Process.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.StackTrace.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.TextWriterTraceListener.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.Tools.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.TraceSource.dll" />
<File Source="$(var.BrokerBinDir)\System.Diagnostics.Tracing.dll" />
<File Source="$(var.BrokerBinDir)\System.Drawing.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\System.Dynamic.Runtime.dll" />
<File Source="$(var.BrokerBinDir)\System.Globalization.Calendars.dll" />
<File Source="$(var.BrokerBinDir)\System.Globalization.dll" />
<File Source="$(var.BrokerBinDir)\System.Globalization.Extensions.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.Compression.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.Compression.ZipFile.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.FileSystem.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.FileSystem.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.FileSystem.Watcher.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.IsolatedStorage.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.MemoryMappedFiles.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.Pipes.AccessControl.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.Pipes.dll" />
<File Source="$(var.BrokerBinDir)\System.IO.UnmanagedMemoryStream.dll" />
<File Source="$(var.BrokerBinDir)\System.Linq.dll" />
<File Source="$(var.BrokerBinDir)\System.Linq.Expressions.dll" />
<File Source="$(var.BrokerBinDir)\System.Linq.Parallel.dll" />
<File Source="$(var.BrokerBinDir)\System.Linq.Queryable.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.Http.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.Http.WinHttpHandler.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.NameResolution.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.NetworkInformation.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.Ping.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.Requests.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.Security.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.Sockets.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.WebHeaderCollection.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.WebSockets.Client.dll" />
<File Source="$(var.BrokerBinDir)\System.Net.WebSockets.dll" />
<File Source="$(var.BrokerBinDir)\System.Numerics.Vectors.dll" />
<File Source="$(var.BrokerBinDir)\System.ObjectModel.dll" />
<File Source="$(var.BrokerBinDir)\System.Reflection.dll" />
<File Source="$(var.BrokerBinDir)\System.Reflection.Extensions.dll" />
<File Source="$(var.BrokerBinDir)\System.Reflection.Metadata.dll" />
<File Source="$(var.BrokerBinDir)\System.Reflection.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\System.Resources.Reader.dll" />
<File Source="$(var.BrokerBinDir)\System.Resources.ResourceManager.dll" />
<File Source="$(var.BrokerBinDir)\System.Resources.Writer.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.CompilerServices.Unsafe.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.Extensions.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.Handles.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.InteropServices.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.InteropServices.RuntimeInformation.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.Numerics.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.Serialization.Formatters.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.Serialization.Json.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.Serialization.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\System.Runtime.Serialization.Xml.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.AccessControl.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Claims.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Cryptography.Algorithms.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Cryptography.Csp.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Cryptography.Encoding.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Cryptography.Primitives.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Cryptography.X509Certificates.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Cryptography.Xml.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Principal.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.Principal.Windows.dll" />
<File Source="$(var.BrokerBinDir)\System.Security.SecureString.dll" />
<File Source="$(var.BrokerBinDir)\System.Text.Encoding.CodePages.dll" />
<File Source="$(var.BrokerBinDir)\System.Text.Encodings.Web.dll" />
<File Source="$(var.BrokerBinDir)\System.Text.RegularExpressions.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.Overlapped.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.Tasks.Dataflow.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.Tasks.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.Tasks.Extensions.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.Thread.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.ThreadPool.dll" />
<File Source="$(var.BrokerBinDir)\System.Threading.Timer.dll" />
<File Source="$(var.BrokerBinDir)\System.ValueTuple.dll" />
<File Source="$(var.BrokerBinDir)\System.Xml.ReaderWriter.dll" />
<File Source="$(var.BrokerBinDir)\System.Xml.XDocument.dll" />
<File Source="$(var.BrokerBinDir)\System.Xml.XmlDocument.dll" />
<File Source="$(var.BrokerBinDir)\System.Xml.XmlSerializer.dll" />
<File Source="$(var.BrokerBinDir)\System.Xml.XPath.dll" />
<File Source="$(var.BrokerBinDir)\System.Xml.XPath.XDocument.dll" />
<File Source="$(var.BrokerBinDir)\libuv.dll" />
<File Source="$(var.BrokerBinDir)\netstandard.dll" />
</Include>

2
src/Windows/Setup/RemoteServices/project.json
Просмотреть файл

@ -3,7 +3,7 @@
"MicroBuild.Core": "0.2.0"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

2
src/Windows/Setup/WixInstall/WixInstall.csproj
Просмотреть файл

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WixInstall</RootNamespace>
<AssemblyName>WixInstall</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>

2
src/Windows/Setup/WixInstall/project.json
Просмотреть файл

@ -6,7 +6,7 @@
"WiX": "3.11.0"
},
"frameworks": {
"net461": {}
"net471": {}
},
"runtimes": {
"win": {}

4
src/Windows/Sql/Impl/Microsoft.VisualStudio.R.Sql.csproj
Просмотреть файл

@ -1,7 +1,7 @@

<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.VisualStudio.R.Sql</RootNamespace>
<AssemblyName>Microsoft.VisualStudio.R.Sql</AssemblyName>
</PropertyGroup>
@ -27,7 +27,7 @@
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="10.0.30319" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="15.0.25726-Preview5" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="15.6.241-preview" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SourceDirectory)Common\Core\Impl\Microsoft.R.Common.Core.csproj" />

4
src/Windows/UnitTests/Core/Impl/Microsoft.UnitTests.Core.Windows.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.UnitTests.Core</RootNamespace>
<AssemblyName>Microsoft.UnitTests.Core.Windows</AssemblyName>
</PropertyGroup>
@ -30,10 +30,10 @@
<ItemGroup>
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.15.103" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.4.27004" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>

19
src/Windows/UnitTests/Core/Impl/VsPaths.cs
Просмотреть файл

@ -5,9 +5,10 @@ using System;
using System.Diagnostics;
using System.IO;
using Microsoft.Common.Core;
using Microsoft.VisualStudio.Setup.Configuration;
namespace Microsoft.UnitTests.Core {
public sealed class VsPaths: Paths {
public sealed partial class VsPaths: Paths {
private static Lazy<string> VsRootLazy { get; } = Lazy.Create(GetVsRoot);
private static Lazy<string> VsCommonExtensionsLazy { get; } = Lazy.Create(() => Path.Combine(VsRoot, @"CommonExtensions\"));
private static Lazy<string> VsPrivateAssembliesLazy { get; } = Lazy.Create(() => Path.Combine(VsRoot, @"PrivateAssemblies\"));
@ -19,19 +20,11 @@ namespace Microsoft.UnitTests.Core {
public static string VsPublicAssemblies => VsPublicAssembliesLazy.Value;
private static string GetVsRoot() {
// See https://github.com/Microsoft/vswhere
var processPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), "Microsoft Visual Studio", "Installer", "vswhere.exe");
var psi = new ProcessStartInfo {
FileName = processPath,
Arguments = "-latest -property productPath",
UseShellExecute = false,
RedirectStandardOutput = true,
CreateNoWindow = true
};
var configuration = (ISetupConfiguration2)new SetupConfiguration();
var current = (ISetupInstance2)configuration.GetInstanceForCurrentProcess();
var path = current.ResolvePath(current.GetProductPath());
return Path.GetDirectoryName(path);
var process = Process.Start(psi);
var devenvPath = process.StandardOutput.ReadLine();
return Path.GetDirectoryName(devenvPath);
}
}
}

2
src/Windows/UnitTests/Core/Test/Microsoft.UnitTests.Core.Windows.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.UnitTests.Core.Test</RootNamespace>
<AssemblyName>Microsoft.UnitTests.Core.Windows.Test</AssemblyName>
</PropertyGroup>

2
src/Windows/Wpf/Impl/Microsoft.Common.Wpf.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.Common.Wpf</RootNamespace>
<AssemblyName>Microsoft.R.Common.Wpf</AssemblyName>
</PropertyGroup>

2
src/Windows/Wpf/Test/Microsoft.Common.Wpf.Test.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net471</TargetFramework>
<RootNamespace>Microsoft.Common.Wpf.Test</RootNamespace>
<AssemblyName>Microsoft.Common.Wpf.Test</AssemblyName>
</PropertyGroup>