()));
@@ -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]