Skip to content
代码片段 群组 项目
未验证 提交 02dbcc0a 编辑于 作者: Michael Simons's avatar Michael Simons 提交者: GitHub
浏览文件

Source build patches necessary for tarball build (#35024)

上级 45222c12
No related branches found
No related tags found
无相关合并请求
...@@ -754,7 +754,7 @@ stages: ...@@ -754,7 +754,7 @@ stages:
platform: platform:
name: 'Managed' name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754'
buildScript: './eng/build.sh $(_PublishArgs)' buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
skipPublishValidation: true skipPublishValidation: true
# Publish to the BAR # Publish to the BAR
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
BeforeTargets="Execute"> BeforeTargets="Execute">
<Exec <Exec
Command="./eng/build.sh --only-build-repo-tasks" Command="./eng/build.sh --only-build-repo-tasks -bl"
WorkingDirectory="$(InnerSourceBuildRepoRoot)" WorkingDirectory="$(InnerSourceBuildRepoRoot)"
EnvironmentVariables="@(InnerBuildEnv)" /> EnvironmentVariables="@(InnerBuildEnv)" />
</Target> </Target>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. --> <!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
<Target Name="GenerateDirectoryBuildFiles" <Target Name="GenerateDirectoryBuildFiles"
AfterTargets="Restore" AfterTargets="Restore"
Condition=" '$(DotNetBuildFromSource)' != 'true' AND '$(MSBuildRuntimeType)' == 'core' "> Condition=" '$(MSBuildRuntimeType)' == 'core' ">
<!-- Separate invocations and use different properties to ensure second can load the restored package info. --> <!-- Separate invocations and use different properties to ensure second can load the restored package info. -->
<MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj" <MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
RemoveProperties="BaseIntermediateOutputPath" RemoveProperties="BaseIntermediateOutputPath"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<PropertyGroup> <PropertyGroup>
<!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. --> <!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. -->
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" /> <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" /> <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"> <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册