Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 5.0 GA #1845

Merged
merged 26 commits into from
Nov 3, 2020
Merged

Update to 5.0 GA #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cde2f44
Update to 5.0.100-rtm.20521.5, BAR Build ID 68494
dseefeld Oct 22, 2020
754ba87
Update previously source-built to N-1
dseefeld Oct 22, 2020
9d1cbb7
Reconcile patches
dseefeld Oct 23, 2020
0a95e42
Update to 5.0.100-rtm.20522.4, BAR Build ID 68583
dseefeld Oct 26, 2020
ce1386d
Update commits in Version.Details.xml and reconcile patches
dseefeld Oct 27, 2020
0a3ce07
Remove temporary RC1 fix in aspnetcore
dseefeld Oct 28, 2020
f434b4e
Install built runtime for usage by aspnetcore
dseefeld Oct 28, 2020
f46b98f
Update roslyn to build CodeStyle packages
dseefeld Oct 28, 2020
317e0ae
Update / add installer patches
dseefeld Oct 29, 2020
084a2a7
Fix broken patch
dseefeld Oct 29, 2020
5160b7c
Update prevSourceBuilt to GA version
dseefeld Oct 29, 2020
adae8b2
Pin System.Security.Cryptography.Cng version in runtime build
dseefeld Oct 30, 2020
9a9a56f
Update path to sdk installation
dseefeld Oct 30, 2020
e99ca58
Update smoke test nuget.config entries
dseefeld Oct 30, 2020
3fcb32f
Update online prebuilt baseline
dseefeld Oct 30, 2020
909a8cc
Update package name for aspnetcore reference
dseefeld Oct 30, 2020
50bfc0d
Add runtime feed to smoke-testNuGet.Config
dseefeld Oct 30, 2020
82e9958
Update runtime config entry
dseefeld Oct 30, 2020
059cd96
Update to 20201026.5, BAR Build ID 68880
dseefeld Oct 30, 2020
ecdb22a
Set UseStableVersions flag
dseefeld Nov 2, 2020
45e1c26
Update online baseline
dseefeld Nov 2, 2020
a77ec25
Update offline prebuilt baseline
dseefeld Nov 2, 2020
943c33a
Include patch from https://github.com/dotnet/source-build/pull/1850/
dseefeld Nov 3, 2020
a1ad7a4
Merge branch 'master' into 5.0GA
dseefeld Nov 3, 2020
9e05d3e
Re-add portable build only prebuilts
dseefeld Nov 3, 2020
5fa1a69
Merge branch '5.0GA' of https://github.com/dseefeld/source-build into…
dseefeld Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
<Platform Condition="'$(Platform)' == ''">x64</Platform>

<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
<UseStableVersions Condition="'$(UseStableVersions)' == ''">true</UseStableVersions>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we delete this line? #1627

Copy link
Contributor Author

@dseefeld dseefeld Nov 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Without it, Roslyn wasn't building stable versions.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Roslyn wasn't building stable versions.

Why is that a goal? The Microsoft Roslyn build didn't produce stable versions.
https://maestro-prod.westus2.cloudapp.azure.com/1297/https:%2F%2Fgithub.com%2Fdotnet%2Froslyn/68310/graph

image

And in Version.Details.xml, <Dependency Name="Microsoft.NETCore.Compilers" Version="3.8.0-5.20519.18" ...

vs.

  [14:25:41.87] Building 'roslyn'...done
  New NuGet package(s) after building roslyn:
    -> Microsoft.CodeAnalysis.Build.Tasks 3.8.0
    -> Microsoft.CodeAnalysis.Common 3.8.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm... A later repo was looking for a stable version and wasn't finding it. I was mistaken in my fix for that.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine to leave #1627 tracking it for followup but wanted to dig into any issues to make it easier to tackle later.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the patch, the production build produces Microsoft.NETCore.Compilers.3.8.0-dev.20519.18.nupkg. The "dev" version doesn't seem right.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds like a missing -ci or OfficialBuildId or something along those lines.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't change roslyn.proj. It has OfficialBuild=true here:

source-build/repos/roslyn.proj

Line 12 in 92d2aef

<BuildCommandArgs>$(BuildCommandArgs) /p:OfficialBuild=true</BuildCommandArgs>

Copy link
Contributor Author

@dseefeld dseefeld Nov 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding --ci to roslyn.proj caused it to generate the desired version. Microsoft.Net.Compilers.Toolset.3.8.0-5.20519.18.nupkg I'll fix this under #1627 once this PR is merged


<!-- new supported portable/nonportable options. These control whether to build portable runtime
or portable SDK. The PortableBuild flag is only set in runtime-portable.proj and should
Expand Down
6 changes: 6 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<configuration>
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-templating-3198063" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-31980633/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-cf258a1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-cf258a14-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-msbuild-126527f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-126527ff/nuget/v3/index.json" />
<add key="darc-pub-dotnet-aspnetcore-371a26f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-371a26f0/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
Expand Down
46 changes: 23 additions & 23 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
<RepoName>aspnet-xdt</RepoName>
</Dependency>
<Dependency Name="ILLink.Tasks" Version="5.0.0-rc.1.20431.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.20513.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>863b5502cc43b1c75b5a93ac395899f8d8b5f0a4</Sha>
<Sha>e792d61a0ead2f6422b4c9af651c1128d978d454</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20451.14">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
<RepoName>runtime</RepoName>
<RepoName>runtime-portable</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-rc.1.20431.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>da62f3656cac0ac4bfb6b012bc072b3499f78e6c</Sha>
<Sha>31980633108a1bef00c798136fcd30a873c90fa3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.20407.5">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand All @@ -46,22 +46,22 @@
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>afd010ba8cb3cbd714c734465d1a5de1ee133e2d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.8.0-3.20452.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.8.0-5.20519.18" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>90e570d763637c4d0d30524674a64b07bb885994</Sha>
<Sha>4c195c3ac1974edcefa76774d7a59a2350ec55fa</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.8.0-preview-20414-02" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/microsoft/msbuild</Uri>
<Sha>a55ce4fbb09e1ff104c815ab5b5c7609c4251e81</Sha>
<Dependency Name="Microsoft.Build" Version="16.8.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>126527ff107ae93fed10af675506c56d046aa5a3</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.8.0-preview.3.6783" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6930" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>3501ddedc274ac10d4b135856b7593a6bb8a72f1</Sha>
<Sha>830c8be45dbbccd411ecf6080abff0c2c98079cf</Sha>
<RepoName>nuget-client</RepoName>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rc.1.20452.20" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-rtm.20526.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>394fae2553937858c8f05a6158613dcc7f821fba</Sha>
<Sha>0cdbf80b4176ba4b979bdfc7b630b884f656072f</Sha>
<RepoName>sdk</RepoName>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
Expand All @@ -79,22 +79,22 @@
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>a52f3d7fb58470749ee4035fbbcb7e63c78b0459</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-rc.1.20451.17" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ecdcc752d4639061c2c49727ee77a1039bbbca22</Sha>
<Sha>371a26f07b23ad77c636332c2dfc0cbd1d8137ba</Sha>
<RepoName>aspnetcore</RepoName>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="37.0.0-beta.20428.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>068ebd3c599bc5a47163a18b8b90d2fe5517186e</Sha>
<Sha>da6be68280c89131cdba2045525b80890401defd</Sha>
</Dependency>
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.8.0-preview-20200812-03" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.8.0-release-20201022-02" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>0c0fafa64de5c73981e7c40a99d7363f57635f60</Sha>
<Sha>b195e2589980861425b331e73a859252c3f2b71a</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.100-rc.1.20452.10">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.100-rtm.20526.5">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>473d1b592e8c281f03dcc4024c04c7c188e99c03</Sha>
<Sha>5044b938294b7b920a5a4393a5f0f8b7b1750548</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<!-- Production Dependencies -->
<PropertyGroup>
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20521.1</PrivateSourceBuildReferencePackagesPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-bootstrap.12</PrivateSourceBuiltArtifactsPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-bootstrap.13</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions patches/aspnetcore/0004-Exclude-some-projects-from-source-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ index 86dbc3c929..908fa251c7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,9 +16,11 @@
<IsUnitTestProject>false</IsUnitTestProject>
<IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject>
<IsUnitTestProject Condition="'$(IsSpecificationTestProject)' != 'true' and ( $(MSBuildProjectName.EndsWith('Tests')) or $(MSBuildProjectName.EndsWith('.Test')) or $(MSBuildProjectName.EndsWith('.FunctionalTest')) )">true</IsUnitTestProject>
<IsTestAssetProject Condition="$(RepoRelativeProjectDir.Contains('testassets'))">true</IsTestAssetProject>
+ <IsOtherTestProject Condition="$(MSBuildProjectName.Contains('IntegrationTesting')) or $(MSBuildProjectName.Contains('TestCommon'))">true</IsOtherTestProject>
<IsSampleProject Condition="$(RepoRelativeProjectDir.Contains('sample'))">true</IsSampleProject>
<IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
<IsShipping Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true'">false</IsShipping>
+ <ExcludeFromSourceBuild Condition="'$(IsSampleProject)' == 'true' or '$(IsTestAssetProject)' == 'true' or '$(IsBenchmarkProject)' == 'true' or '$(IsUnitTestProject)' == 'true' or '$(IsSpecificationTestProject)' == 'true' or '$(IsOtherTestProject)' == 'true'">true</ExcludeFromSourceBuild>

<!--
Following logic mimics core-setup approach as well as
--
--
2.18.2

24 changes: 0 additions & 24 deletions patches/aspnetcore/0005-Fix-version-number.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions patches/aspnetcore/0006-Remove-Yarn-dependency-not-used-in-source-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ index 6496dffe47..561d2c585c 100644
},
"msbuild-sdks": {
- "Yarn.MSBuild": "1.15.2",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.1"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20510.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20510.1"
}
diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
index 4b27caa77b..f6b1a7c4aa 100644
Expand Down
2 changes: 1 addition & 1 deletion patches/aspnetcore/0009-Support-global.json-on-arm64-as-well.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ index 561d2c585c..494e0e8e07 100644
+++ b/global.json
@@ -5,13 +5,10 @@
"tools": {
"dotnet": "5.0.100-rc.1.20379.10",
"dotnet": "5.0.100-rc.2.20479.15",
"runtimes": {
- "dotnet/x64": [
+ "dotnet": [
Expand Down
2 changes: 1 addition & 1 deletion patches/aspnetcore/0012-Don-t-build-for-full-fx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ index adf7330a3f..a18704d0a8 100644
--- a/src/Components/WebAssembly/Sdk/src/Microsoft.NET.Sdk.BlazorWebAssembly.csproj
+++ b/src/Components/WebAssembly/Sdk/src/Microsoft.NET.Sdk.BlazorWebAssembly.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>MSBuild support for building Blazor WebAssembly apps.</Description>
- <TargetFrameworks>$(DefaultNetCoreTargetFramework);net46</TargetFrameworks>
Expand Down
8 changes: 4 additions & 4 deletions patches/aspnetcore/0013-Fix-a-couple-issues.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ diff --git a/src/Components/Components.slnf b/src/Components/Components.slnf
index 637ec1a384..9bb64a3495 100644
--- a/src/Components/Components.slnf
+++ b/src/Components/Components.slnf
@@ -98,7 +98,6 @@
"src\\Components\\Ignitor\\src\\Ignitor.csproj",
@@ -99,7 +99,6 @@
"src\\Components\\Ignitor\\test\\Ignitor.Test.csproj",
"src\\Components\\test\\testassets\\ComponentsApp.Server\\ComponentsApp.Server.csproj",
"src\\Components\\test\\testassets\\GlobalizationWasmApp\\GlobalizationWasmApp.csproj",
- "src\\Components\\benchmarkapps\\Wasm.Performance\\Driver\\Wasm.Performance.Driver.csproj",
"src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj",
"src\\Components\\Web.Extensions\\src\\Microsoft.AspNetCore.Components.Web.Extensions.csproj",
"src\\Components\\WebAssembly\\Server\\test\\Microsoft.AspNetCore.Components.WebAssembly.Server.Tests.csproj",
"src\\Components\\WebAssembly\\Authentication.Msal\\src\\Microsoft.Authentication.WebAssembly.Msal.csproj",
diff --git a/src/Components/ComponentsNoDeps.slnf b/src/Components/ComponentsNoDeps.slnf
index dd08970d02..34e5619a94 100644
--- a/src/Components/ComponentsNoDeps.slnf
+++ b/src/Components/ComponentsNoDeps.slnf
@@ -39,7 +39,6 @@
@@ -38,7 +38,6 @@
"src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
"src\\Components\\Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj",
"src\\Components\\benchmarkapps\\Wasm.Performance\\ConsoleHost\\Wasm.Performance.ConsoleHost.csproj",
Expand Down
9 changes: 5 additions & 4 deletions patches/installer/0004-ExcludeFromSourceBuild-not-working-again.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Subject: [PATCH 4/4] ExcludeFromSourceBuild not working again
---
Microsoft.DotNet.Cli.sln | 7 ------
src/SdkResolver/SdkResolver.csproj | 39 ------------------------------
src/redist/redist.csproj | 2 +-
3 files changed, 1 insertion(+), 47 deletions(-)
src/redist/redist.csproj | 4 ++--
3 files changed, 2 insertion(+), 48 deletions(-)
delete mode 100644 src/SdkResolver/SdkResolver.csproj

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
Expand Down Expand Up @@ -91,15 +91,16 @@ diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 35c3d4ad9..15601e98f 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -11,7 +11,7 @@
@@ -12,7 +12,7 @@
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
/>

- <ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" />
+ <ProjectReference Include="..\SdkResolver\SdkResolver.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildFromSource)' != 'true'" />
- <ProjectReference Include="..\VSTemplateLocator\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" />
+ <ProjectReference Include="..\VSTemplateLocator\VSTemplateLocator.csproj" ReferenceOutputAssembly="false" Condition="'$(DotNetBuildFromSource)' != 'true'" />
</ItemGroup>

<ItemGroup>
--
2.18.0

28 changes: 28 additions & 0 deletions patches/installer/0008-Update-blob-versions-to-use-ref-pkg-versions-to-trac.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 992512755a9df08ccfd531f7507c298aa5b22112 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Thu, 29 Oct 2020 16:01:59 +0000
Subject: [PATCH] Update blob versions to use ref pkg versions to track stable
versions

---
src/redist/targets/GenerateLayout.targets | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 9e7249d..f1b11d4 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -11,8 +11,8 @@

<PropertyGroup>
<!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
- <AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion)</AspNetCoreBlobVersion>
- <CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
+ <AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetCoreBlobVersion>
+ <CoreSetupBlobVersion>$(MicrosoftNETCoreAppRefPackageVersion)</CoreSetupBlobVersion>
dseefeld marked this conversation as resolved.
Show resolved Hide resolved
<WindowsDesktopBlobVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</WindowsDesktopBlobVersion>

<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
--
1.8.3.1

4 changes: 2 additions & 2 deletions patches/nuget-client/0002-Pin-newtonsoft-json-to-a-specific-version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ index a5fa8b5f6..7ceec6b95 100644
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<MicrosoftBuildPackageVersion Condition="'$(MicrosoftBuildPackageVersion)' == ''">16.5.0-preview-19606-01</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion Condition="'$(MicrosoftBuildPackageVersion)' == ''">16.6.0</MicrosoftBuildPackageVersion>
- <NewtonsoftJsonPackageVersion Condition="$(NewtonsoftJsonPackageVersion) == ''">9.0.1</NewtonsoftJsonPackageVersion>
+ <NewtonsoftJsonPackageVersion>9.0.1</NewtonsoftJsonPackageVersion>
<SystemPackagesVersion>4.3.0</SystemPackagesVersion>
<VSComponentsVersion>16.4.280</VSComponentsVersion>
<VSComponentsVersion>16.6.255</VSComponentsVersion>
<VSFrameworkVersion>16.6.30107.105</VSFrameworkVersion>
--
2.18.0
Expand Down
16 changes: 8 additions & 8 deletions patches/nuget-client/0005-Remove-unneeded-feeds.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ diff --git a/NuGet.Config b/NuGet.Config
index fed206f92..245eea2b9 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -7,9 +7,7 @@
@@ -4,9 +4,7 @@
<clear />
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
- <add key="vside_vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
- <add key="vside_vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />

<!-- Microsoft.VisualStudio.ProjectSystem.Managed* from roslyn. moving to vs-impl with new versions soon. -->
<add key="dotnet-roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
- <add key="vside" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
<add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />
- <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
--
2.18.0

Loading