diff --git a/README.md b/README.md index 8807beaa1..e6d7174b4 100644 --- a/README.md +++ b/README.md @@ -226,4 +226,3 @@ License ------- By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula). - diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj index 21eb0a6d1..e024fb2ba 100644 --- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj +++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj @@ -10,7 +10,7 @@ true - \prefercliruntime + / diff --git a/build/Branding.props b/build/Branding.props index e1ea0a1a6..3d0b29db1 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -2,7 +2,7 @@ Microsoft .NET Core SDK - 2.1.100 .NET Standard Support for Visual Studio 2015 - Microsoft .NET Core Runtime - 2.0.5 + Microsoft .NET Core Runtime - 2.0.6 Microsoft .NET Core Host - 2.0.1 Microsoft .NET Core Host FX Resolver - 2.0.0 diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 2f838edd4..a0f45390e 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,23 +1,23 @@ - 2.0.5 + 2.0.6-servicing-26118-01 $(MicrosoftNETCoreAppPackageVersion) - 15.6.0-preview-000054-1286830 + 15.6.81 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 4.2.0-rtm-171104-0 - 2.6.0-beta3-62309-01 + 10.1.2-rtm-180131-0 + 2.7.0-beta3-62612-07 $(MicrosoftCodeAnalysisCSharpPackageVersion) $(MicrosoftCodeAnalysisCSharpPackageVersion) - 15.5.0-preview-62507-01 + 15.5.0-preview-62518-04 $(MicrosoftNETSdkPackageVersion) 2.0.0-rel-20171110-671 $(MicrosoftNETSdkWebPackageVersion) $(MicrosoftNETSdkWebPackageVersion) - 1.0.0-beta3-20171110-312 + 1.0.0-beta3-20171117-314 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.0-beta3-20171117-314 @@ -31,7 +31,7 @@ 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) 1.6.0-beta2-25304 - 4.5.0-rtm-4651 + 4.6.0-rtm-4918 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) @@ -45,8 +45,6 @@ $(MicrosoftNETTestSdkPackageVersion) 0.2.0-beta-000042 0.2.0 - 2.6.0-pre-20171122-1 - 4.4.1-pre-20171122-1 @@ -60,14 +58,14 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.0.5 + 2.0.6 notimestamp - 2.0.5 + 2.0.6 rtm - 2.0.5 - 155 + 2.0.6 + 10007 aspnetcore-store $(AspNetCoreVersion)-$(AspNetCoreRelease) @@ -76,7 +74,7 @@ - 1.0.27-prerelease-01723-01 + 2.1.0-prerelease-02430-04 2.0.0-preview2-25331-01 2.1.0-prerelease-02221-02 diff --git a/build/Microsoft.DotNet.Cli.tasks b/build/Microsoft.DotNet.Cli.tasks index 1c846d8b0..901a48f84 100644 --- a/build/Microsoft.DotNet.Cli.tasks +++ b/build/Microsoft.DotNet.Cli.tasks @@ -1,7 +1,6 @@ - diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets index ae5e96175..c37260b8e 100644 --- a/build/NugetConfigFile.targets +++ b/build/NugetConfigFile.targets @@ -50,7 +50,7 @@ + @@ -90,6 +91,7 @@ + @@ -113,6 +115,7 @@ + @@ -128,6 +131,7 @@ + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index 9224596be..f4cfc11a2 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -38,6 +38,7 @@ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-2.0.5 $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(HostRid) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb @@ -127,8 +128,10 @@ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb + $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName203) + $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName205) $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName) + diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets index e987eb530..04d79e051 100644 --- a/build/package/Installer.RPM.targets +++ b/build/package/Installer.RPM.targets @@ -55,6 +55,7 @@ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-2.0.0 $(AspNetCoreRuntimePackageBrandName)-2.0.3 + $(AspNetCoreRuntimePackageBrandName)-2.0.5 $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp) $(AspNetCoreVersion) $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm @@ -189,8 +190,10 @@ $(AspNetCoreRuntimePackageBrandName)-2.0.0-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(AspNetCoreRuntimePackageBrandName)-2.0.3-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm + $(AspNetCoreRuntimePackageBrandName)-2.0.5-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName200) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName203) + $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName205) $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName) + @@ -239,6 +245,7 @@ + @@ -255,6 +262,7 @@ + diff --git a/build_projects/dotnet-cli-build/AddToDeps.cs b/build_projects/dotnet-cli-build/AddToDeps.cs deleted file mode 100644 index ca02cd474..000000000 --- a/build_projects/dotnet-cli-build/AddToDeps.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.IO; -using System.Linq; - -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Extensions.DependencyModel; - -namespace Microsoft.DotNet.Cli.Build -{ - /// - /// Merges additional .deps.json files into target .deps.json files. - /// - public class AddToDeps : Task - { - /// - /// Paths to target .deps.json files, into which will be merged. - /// These files will be overwritten with the merge result. - /// - [Required] - public string[] TargetDeps { get; set; } - - /// - /// Paths to additional .deps.json files to merge into . - /// - [Required] - public string[] AdditionalDeps { get; set; } - - public override bool Execute() - { - DependencyContext additionalContext = Read(AdditionalDeps.First()); - - foreach (string additionalPath in AdditionalDeps.Skip(1)) - { - additionalContext = additionalContext.Merge(Read(additionalPath)); - } - - foreach (string targetPath in TargetDeps) - { - DependencyContext targetContext = Read(targetPath).Merge(additionalContext); - Write(targetContext, targetPath); - } - - return true; - } - - private static DependencyContext Read(string path) - { - using (FileStream stream = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read)) - using (var reader = new DependencyContextJsonReader()) - { - return reader.Read(stream); - } - } - - private static void Write(DependencyContext context, string path) - { - using (FileStream stream = File.Open(path, FileMode.Create, FileAccess.Write, FileShare.Read)) - { - var writer = new DependencyContextWriter(); // unlike reader, writer is not disposable - writer.Write(context, stream); - } - } - } -} \ No newline at end of file diff --git a/build_projects/update-dependencies/Config.cs b/build_projects/update-dependencies/Config.cs index 0bd5a0c6a..75c0d0c81 100644 --- a/build_projects/update-dependencies/Config.cs +++ b/build_projects/update-dependencies/Config.cs @@ -39,12 +39,15 @@ namespace Microsoft.DotNet.Scripts private Lazy _dotNetVersionUrl = new Lazy(() => GetEnvironmentVariable("DOTNET_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info")); private Lazy _coreSetupVersionFragment = new Lazy(() => GetEnvironmentVariable("CORESETUP_VERSION_FRAGMENT", GetDefaultCoreSetupVersionFragment())); + + private Lazy _roslynVersionFragment = new Lazy(() => GetEnvironmentVariable("ROSLYN_VERSION_FRAGMENT")); private Lazy _gitHubUpstreamOwner = new Lazy(() => GetEnvironmentVariable("GITHUB_UPSTREAM_OWNER", "dotnet")); private Lazy _gitHubProject = new Lazy(() => GetEnvironmentVariable("GITHUB_PROJECT", "cli")); private Lazy _gitHubUpstreamBranch = new Lazy(() => GetEnvironmentVariable("GITHUB_UPSTREAM_BRANCH", GetDefaultUpstreamBranch())); private Lazy _gitHubPullRequestNotifications = new Lazy(() => GetEnvironmentVariable("GITHUB_PULL_REQUEST_NOTIFICATIONS", "") .Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)); + private Config() { } @@ -54,6 +57,8 @@ namespace Microsoft.DotNet.Scripts public string Password => _password.Value; public string DotNetVersionUrl => _dotNetVersionUrl.Value; public string CoreSetupVersionFragment => _coreSetupVersionFragment.Value; + public string RoslynVersionFragment => _roslynVersionFragment.Value; + public bool HasRoslynVersionFragment => !string.IsNullOrEmpty(RoslynVersionFragment); public string GitHubUpstreamOwner => _gitHubUpstreamOwner.Value; public string GitHubProject => _gitHubProject.Value; public string GitHubUpstreamBranch => _gitHubUpstreamBranch.Value; diff --git a/build_projects/update-dependencies/Program.cs b/build_projects/update-dependencies/Program.cs index 27926a77c..99b77691e 100644 --- a/build_projects/update-dependencies/Program.cs +++ b/build_projects/update-dependencies/Program.cs @@ -4,6 +4,7 @@ using Microsoft.DotNet.VersionTools; using Microsoft.DotNet.VersionTools.Automation; using Microsoft.DotNet.VersionTools.Dependencies; +using Microsoft.DotNet.VersionTools.Dependencies.BuildOutput; using System; using System.Collections.Generic; using System.Diagnostics; @@ -27,9 +28,14 @@ namespace Microsoft.DotNet.Scripts buildInfos.Add(GetBuildInfo("CoreSetup", s_config.CoreSetupVersionFragment, fetchLatestReleaseFile: false)); + if (s_config.HasRoslynVersionFragment) + { + buildInfos.Add(GetBuildInfo("Roslyn", s_config.RoslynVersionFragment, fetchLatestReleaseFile: false)); + } + IEnumerable updaters = GetUpdaters(); var dependencyBuildInfos = buildInfos.Select(buildInfo => - new DependencyBuildInfo( + new BuildDependencyInfo( buildInfo, upgradeStableVersions: true, disabledPackages: Enumerable.Empty())); @@ -50,11 +56,14 @@ namespace Microsoft.DotNet.Scripts body += PullRequestCreator.NotificationString(s_config.GitHubPullRequestNotifications); } - new PullRequestCreator(gitHubAuth, origin, upstreamBranch) + new PullRequestCreator(gitHubAuth) .CreateOrUpdateAsync( suggestedMessage, suggestedMessage + $" ({upstreamBranch.Name})", - body) + body, + upstreamBranch, + origin, + new PullRequestOptions()) .Wait(); } } @@ -84,6 +93,11 @@ namespace Microsoft.DotNet.Scripts yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftNETCoreAppPackageVersion", "Microsoft.NETCore.App"); yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftDotNetPlatformAbstractionsPackageVersion", "Microsoft.DotNet.PlatformAbstractions"); yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftExtensionsDependencyModelPackageVersion", "Microsoft.Extensions.DependencyModel"); + + if (s_config.HasRoslynVersionFragment) + { + yield return CreateRegexUpdater(dependencyVersionsPath, "MicrosoftCodeAnalysisCSharpPackageVersion", "Microsoft.CodeAnalysis.CSharp"); + } } private static IDependencyUpdater CreateRegexUpdater(string repoRelativePath, string propertyName, string packageId) diff --git a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/packaging/osx/clisdk/resources/de.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/packaging/osx/clisdk/resources/en.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/packaging/osx/clisdk/resources/es.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/packaging/osx/clisdk/resources/it.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index 30bd2b485..c7644d4e9 100644 --- a/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -8,7 +8,7 @@

The following was installed at /usr/local/share/dotnet

  • .NET Core SDK 2.1.100
  • -
  • .NET Core Runtime 2.0.5
  • +
  • .NET Core Runtime 2.0.6
  • Runtime Package Store
diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index 74f1df4d6..94b9d6efc 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -51,7 +51,7 @@ The following were installed at [DOTNETHOME] • .NET Core SDK 2.1.100 - • .NET Core Runtime 2.0.5 + • .NET Core Runtime 2.0.6 • Runtime Package Store This product collects usage data diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index b8349f820..3879fe674 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -77,13 +77,12 @@ - - + "version": ".*" @@ -94,12 +93,7 @@ DestinationFile="%(RoslynRuntimeConfigs.Identity)" ReplacementPatterns="$(ReplacementPattern)" ReplacementStrings="$(ReplacementString)" /> - - - + - + diff --git a/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj b/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj deleted file mode 100644 index 8e961be59..000000000 --- a/src/tool_roslyn_satellites/tool_roslyn_satellites.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - $(CliVersionPrefix) - $(CliTargetFramework) - $(MicrosoftNETCoreAppPackageVersion) - $(RoslynDirectory)/bincore - $(CommitCount) - false - false - false - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs index 01967abfc..273605674 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs @@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests result.Should().NotBeNull(); - result.Args.Should().Contain("--fx-version 2.0.5"); + result.Args.Should().Contain("--fx-version 2.0.6-servicing-26118-01"); } [Fact]