[ArPow] Add sdk repo to arpow tarball (#11454)
This commit is contained in:
Michael Simons
GitHub
parent
0faf604667
commit
7538de49ce
8 changed files with 139 additions and 26 deletions
|
|
@ -47,6 +47,11 @@
|
|||
<Sha>566b53a66b0afa573f0dae33d07c8de9685aa5c8</Sha>
|
||||
<SourceBuild RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.7.21362.11">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>5fab7585de482237f470634489b969a1bd03e063</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DiaSymReader" Version="1.4.0-beta2-21315-01">
|
||||
<Uri>https://github.com/dotnet/symreader</Uri>
|
||||
<Sha>1968a003d845d119a9d38ac4daaeea22897f7daf</Sha>
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@
|
|||
<MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
|
||||
<MicrosoftBuildUtilitiesCoreVersion>15.7.179</MicrosoftBuildUtilitiesCoreVersion>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.11</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-5</PrivateSourceBuiltPrebuiltsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-6</PrivateSourceBuiltPrebuiltsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Workload manifest package versions -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@
|
|||
<PropertyGroup>
|
||||
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.11</PrivateSourceBuiltArtifactsPackageVersion>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersionPrefix>0.1.0-6.0.100-</PrivateSourceBuiltPrebuiltsPackageVersionPrefix>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersionSuffix>5</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
|
||||
<PrivateSourceBuiltPrebuiltsPackageVersionSuffix>6</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
From c57808231260cc3467b98d97c3249a59db9757f2 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Mon, 9 Aug 2021 13:43:41 +0000
|
||||
Subject: [PATCH] Update reference versions to be source buildable
|
||||
|
||||
Update CodeAnalysis version reference to utilize Versions.props in order to work with source build.
|
||||
---
|
||||
eng/Versions.props | 1 +
|
||||
.../Microsoft.NET.Sdk.Razor.SourceGenerators.csproj | 4 ++--
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 07cca8a35..8fb6dffaf 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -122,6 +122,7 @@
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/roslyn -->
|
||||
<MicrosoftNetCompilersToolsetPackageVersion>4.0.0-2.21359.14</MicrosoftNetCompilersToolsetPackageVersion>
|
||||
+ <MicrosoftCodeAnalysisPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
|
||||
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
|
||||
diff --git a/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj b/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj
|
||||
index 1213ec4db..81697986c 100644
|
||||
--- a/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj
|
||||
+++ b/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj
|
||||
@@ -15,8 +15,8 @@
|
||||
<!-- Instead of using the version of M.C.C defined in Version.props we pin to a minimum required
|
||||
version to avoid issues with loading newer versions of the assembly in VS/VS Code. -->
|
||||
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(MicrosoftAspNetCoreRazorLanguageVersion)" GeneratePathProperty="true" />
|
||||
- <PackageReference Include="Microsoft.CodeAnalysis" Version="4.0.0-2.21354.7" />
|
||||
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-2.21354.7" />
|
||||
+ <PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
|
||||
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(MicrosoftCodeAnalysisRazorVersion)" GeneratePathProperty="true" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion)" GeneratePathProperty="true" />
|
||||
</ItemGroup>
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
From 4d2c2370dc85e658508fd0943e47b0d6559f42d5 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Mon, 9 Aug 2021 14:03:33 +0000
|
||||
Subject: [PATCH] NoWarn NU1605 until DeploymentTools is in SourceBuild
|
||||
|
||||
src/Cli/dotnet/dotnet.csproj : error NU1605: Detected package downgrade: Newtonsoft.Json from 12.0.3 to 12.0.2. Reference the package directly from the project to select a different version.
|
||||
|
||||
Error stems from Microsoft.Deployment.DotNet.Releases not being source built and referencing a newer version. Temporary fix until the DeploymentTools repo is added to source-build (https://github.com/dotnet/source-build/issues/2365).
|
||||
---
|
||||
src/Cli/dotnet/dotnet.csproj | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj
|
||||
index 4ff965a4d..f9609824b 100644
|
||||
--- a/src/Cli/dotnet/dotnet.csproj
|
||||
+++ b/src/Cli/dotnet/dotnet.csproj
|
||||
@@ -12,6 +12,7 @@
|
||||
<PackageId>Microsoft.DotNet.Cli</PackageId>
|
||||
<UseAppHost>false</UseAppHost>
|
||||
<IsPackable>true</IsPackable>
|
||||
+ <NoWarn>$(NoWarn);NU1605</NoWarn>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Remove="commands\dotnet-new\**" />
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
From 6009d921575a4474c66b812bdb914237ddb04cc2 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simons <msimons@microsoft.com>
|
||||
Date: Mon, 9 Aug 2021 15:27:19 +0000
|
||||
Subject: [PATCH] Remove 472 TFM from source build
|
||||
|
||||
src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj : error NU1202: Package Microsoft.Build 17.0.0 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package Microsoft.Build 17.0.0 supports: net6.0 (.NETCoreApp,Version=v6.0)
|
||||
src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj : error NU1202: Package Microsoft.Build 17.0.0 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package Microsoft.Build 17.0.0 supports: net6.0 (.NETCoreApp,Version=v6.0)
|
||||
.dotnet/sdk/6.0.100-preview.5.21225.11/Microsoft.Common.CurrentVersion.targets(1717,5): error : Project '../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj' targets 'net6.0'. It cannot be referenced by a project that targets '.NETFramework,Version=v4.7.2'.
|
||||
---
|
||||
.../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 +
|
||||
.../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 +
|
||||
.../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
index c10a6224c..66a26913b 100644
|
||||
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
|
||||
<WarningsAsErrors>true</WarningsAsErrors>
|
||||
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
|
||||
index 280fbdc83..13ada8222 100644
|
||||
--- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
|
||||
+++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
|
||||
@@ -16,6 +16,7 @@
|
||||
<OutputType>Library</OutputType>
|
||||
<RootNamespace>Microsoft.NET.Build.Tasks</RootNamespace>
|
||||
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
|
||||
index e7ff48146..c98ed27cf 100644
|
||||
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
|
||||
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
|
||||
@@ -13,6 +13,7 @@
|
||||
<Description>The MSBuild targets and properties for building .NET Core projects.</Description>
|
||||
<OutputType>Library</OutputType>
|
||||
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
|
||||
<Nullable>annotations</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
|
||||
<!-- Tier 5 -->
|
||||
<RepositoryReference Include="fsharp" />
|
||||
<RepositoryReference Include="sdk" />
|
||||
<RepositoryReference Include="vstest" />
|
||||
|
||||
<!-- Package source-build artifacts -->
|
||||
|
|
|
|||
|
|
@ -1,22 +1,14 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<SourceDirectory>sdk</SourceDirectory>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
|
||||
|
||||
<PropertyGroup>
|
||||
<BuildCommandArgs>--pack --configuration $(Configuration)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PackageProjectUrl=https://github.com/dotnet/sdk</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltToolsetDir)</BuildCommandArgs>
|
||||
|
||||
<LogVerbosityOptOut>true</LogVerbosityOptOut>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) -bl</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) -ci</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:Projects=$(ProjectDirectory)source-build.slnf</BuildCommandArgs>
|
||||
|
||||
<!-- The sdk repo is building with an older version of the SDK where this property is
|
||||
defaulted to false. The SDK that source-build is using defaults it to true.
|
||||
|
|
@ -26,7 +18,7 @@
|
|||
<!-- Pass in package version props using the Product Construction (ProdCon) API. -->
|
||||
<BuildCommandArgs>$(BuildCommandArgs) /p:PB_PackageVersionPropsUrl=file:%2F%2F$(PackageVersionPropsPath)</BuildCommandArgs>
|
||||
|
||||
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
|
||||
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
|
||||
|
||||
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
|
||||
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
|
||||
|
|
@ -34,29 +26,23 @@
|
|||
|
||||
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
|
||||
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
|
||||
|
||||
<EnvironmentRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentRestoreSources>
|
||||
<EnvironmentRestoreSources>$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentRestoreSources>
|
||||
<EnvironmentRestoreSources Condition="'$(BuildWithOnlineSources)' == 'true'">$(EnvironmentRestoreSources)%3Bhttps://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json</EnvironmentRestoreSources>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EnvironmentVariables Include="RestoreSources=$(EnvironmentRestoreSources)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<RepositoryReference Include="arcade" />
|
||||
<RepositoryReference Include="xliff-tasks" />
|
||||
<RepositoryReference Include="runtime" />
|
||||
<!-- TODO: Enable with https://github.com/dotnet/source-build/issues/2274
|
||||
<RepositoryReference Include="runtime" /> -->
|
||||
<RepositoryReference Include="msbuild" />
|
||||
<RepositoryReference Include="newtonsoft-json" />
|
||||
<RepositoryReference Include="newtonsoft-json901" />
|
||||
<RepositoryReference Include="nuget-client" />
|
||||
<RepositoryReference Include="roslyn-analyzers" />
|
||||
<RepositoryReference Include="source-build" />
|
||||
<!-- TODO: https://github.com/dotnet/source-build/issues/2279
|
||||
<RepositoryReference Include="nuget-client" /> -->
|
||||
<!-- TODO: https://github.com/dotnet/source-build/issues/2319
|
||||
<RepositoryReference Include="roslyn-analyzers" /> -->
|
||||
<RepositoryReference Include="vstest" />
|
||||
<RepositoryReference Include="fsharp" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue