Skip to content

Commit

Permalink
Merge pull request #2120 from dseefeld/2.1.27-apr2021
Browse files Browse the repository at this point in the history
Update to the April 2.1.27 release
  • Loading branch information
dseefeld committed Apr 14, 2021
2 parents 0906afb + e6cc227 commit 3b15a88
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion DotnetCLIVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.521
2.1.522
2 changes: 1 addition & 1 deletion ProdConFeed.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210316-03/final/index.json
4 changes: 2 additions & 2 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
the product as version strings to be used by the SDK to fetch extra content.
-->
<PropertyGroup>
<MicrosoftAspNetCoreAllPackageVersion>2.1.26</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.26</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.27</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.27</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion repos/core-setup.proj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<OfficialBuildId>20210212-01</OfficialBuildId>
<OfficialBuildId>20210316-01</OfficialBuildId>

<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>
Expand Down
2 changes: 1 addition & 1 deletion repos/coreclr.proj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20210212-02</OfficialBuildId>
<OfficialBuildId>20210316-01</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/corefx.proj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20210212-01</OfficialBuildId>
<OfficialBuildId>20210316-03</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions smoke-testNuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
<clear />
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
<add key="ProdCon" value="PRODUCT_CONTRUCTION_PACKAGES" />
<add key="smoke-test feed" value="SMOKE_TEST_PACKAGE_FEED" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion src/cli
2 changes: 1 addition & 1 deletion src/core-setup
Submodule core-setup updated 1 files
+1 −1 BranchInfo.props
2 changes: 1 addition & 1 deletion src/coreclr
Submodule coreclr updated 1 files
+1 −1 dependencies.props
12 changes: 6 additions & 6 deletions tools-local/prebuilt-baseline-online.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-05113-01" IsDirectDependency="true" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.26" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.26" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.26" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.27" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.27" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.27" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
Expand All @@ -116,7 +116,7 @@
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.25" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.App" Version="2.1.26" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta2-62719-08" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Compilers" Version="2.8.0-beta4-62824-10" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
Expand Down Expand Up @@ -261,7 +261,7 @@
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="fedora.24-x64" />
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.26" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.25" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.25" Rid="linux-x64" />
Expand Down Expand Up @@ -438,7 +438,7 @@
<Usage Id="System.IO.Compression.ZipFile" Version="4.0.1" />
<Usage Id="System.IO.Compression.ZipFile" Version="4.3.0" />
<Usage Id="System.IO.FileSystem" Version="4.0.1" />
<Usage Id="System.IO.FileSystem" Version="4.3.0" IsDirectDependency="true" />
<Usage Id="System.IO.FileSystem" Version="4.3.0" />
<Usage Id="System.IO.FileSystem.Primitives" Version="4.0.1" />
<Usage Id="System.IO.FileSystem.Primitives" Version="4.3.0" />
<Usage Id="System.IO.FileSystem.Watcher" Version="4.0.0" />
Expand Down

0 comments on commit 3b15a88

Please sign in to comment.