mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Misc source-build repo project cleanup (#11012)

Browse source
This commit is contained in:
Michael Simons 2021-06-30 11:21:05 -05:00 • committed by GitHub
parent a50ee7b8e3
commit 660f661ab4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 11 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SourceBuild/tarball/content/repos/Directory.Build.props
View file

@ -18,6 +18,8 @@
<RedirectRepoOutputToLog Condition="'$(MinimalConsoleLogOutput)' == 'true'">&gt;&gt; $(RepoConsoleLogFile) 2&gt;&amp;1</RedirectRepoOutputToLog>
<IsStable Condition="'$(UseStableVersions)' == 'true'">true</IsStable>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
<!--
Repo specific semaphore path for incremental build
-->

4
src/SourceBuild/tarball/content/repos/arcade.proj
View file

@ -6,15 +6,13 @@
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
<!-- we need to use a prebuilt Arcade to build Arcade -->
<UseBootstrapArcade>true</UseBootstrapArcade>
<IsToolingProject>true</IsToolingProject>

3
src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
View file

@ -24,9 +24,8 @@
<DependencyVersionInputRepoApiImplemented>false</DependencyVersionInputRepoApiImplemented>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
</PropertyGroup>
<ItemGroup>

1
src/SourceBuild/tarball/content/repos/command-line-api.proj
View file

@ -9,7 +9,6 @@
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
</PropertyGroup>
<ItemGroup>

24
src/SourceBuild/tarball/content/repos/common.proj
View file

@ -1,24 +0,0 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<RepositoryOrganization>aspnet</RepositoryOrganization>
<RepositoryBranch>servicing/1.0.x</RepositoryBranch>
<PackagesOutput>$(ProjectDirectory)artifacts/build/</PackagesOutput>
<BuildArguments>/p:Configuration=$(Configuration)</BuildArguments>
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) -NoTest $(BuildArguments)</BuildCommand>
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension) $(BuildArguments)</CleanCommand>
<RepoApiImplemented>false</RepoApiImplemented>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
</PropertyGroup>
<ItemGroup>
<EnvironmentVariables Include="DOTNET_TOOL_DIR=$(DotNetCliToolDir)" />
</ItemGroup>
<ItemGroup>
<RepositoryReference Include="newtonsoft-json" />
</ItemGroup>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project>

1
src/SourceBuild/tarball/content/repos/diagnostics.proj
View file

@ -5,7 +5,6 @@
<PropertyGroup>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<PackagesOutput>$(ProjectDirectory)/artifacts/packages/$(Configuration)/Shipping</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
</PropertyGroup>

3
src/SourceBuild/tarball/content/repos/fsharp.proj
View file

@ -11,10 +11,9 @@
<BuildCommandArgs>$(BuildCommandArgs) /p:TreatWarningsAsErrors=false</BuildCommandArgs>
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</PackagesOutput>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
</PropertyGroup>

3
src/SourceBuild/tarball/content/repos/installer.proj
View file

@ -51,7 +51,6 @@
<PackageOutputRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</PackageOutputRid>
<PackageOutputRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</PackageOutputRid>
<PackageOutputRid Condition="'$(PackageOutputRid)' == ''">$(TargetRid)</PackageOutputRid>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</PackagesOutput>
<TarBallOutput>$(PackagesOutput)</TarBallOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
@ -62,7 +61,7 @@
<!-- This project builds zips, not NuGet packages. -->
<SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<!-- This repo uses text-only template packages from the internal transport feed. -->
<SetUpInternalTransportFeed>true</SetUpInternalTransportFeed>

4
src/SourceBuild/tarball/content/repos/linker.proj
View file

@ -7,10 +7,8 @@
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
</PropertyGroup>

2
src/SourceBuild/tarball/content/repos/msbuild.proj
View file

@ -27,7 +27,7 @@
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
<RepoApiImplemented>false</RepoApiImplemented>

1
src/SourceBuild/tarball/content/repos/nuget-client.proj
View file

@ -7,7 +7,6 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<PackagesOutput>$(ProjectDirectory)artifacts/nupkgs/</PackagesOutput>
<NuGetCoreSourceDirectory>$(ProjectDirectory)src/NuGet.Core/</NuGetCoreSourceDirectory>
<ToolsDirectory>$(ProjectDirectory)cli/</ToolsDirectory>
<NuGetKeyFilePath>$(KeysDir)NuGet.Client.snk</NuGetKeyFilePath>

1
src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj
View file

@ -18,7 +18,6 @@
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

1
src/SourceBuild/tarball/content/repos/roslyn.proj
View file

@ -23,7 +23,6 @@
<BuildCommand>$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>

3
src/SourceBuild/tarball/content/repos/runtime.common.props
View file

@ -109,10 +109,9 @@
<!-- Output / source-build flags -->
<PropertyGroup>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<PackagesOutput>$(ProjectDirectory)bin/Product/$(TargetOS).$(Platform).$(Configuration)/.nuget/pkg</PackagesOutput>
<ShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</ShippingPackagesOutput>
<NonShippingPackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</NonShippingPackagesOutput>
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
</PropertyGroup>

3
src/SourceBuild/tarball/content/repos/sdk.proj
View file

@ -29,12 +29,11 @@
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<!-- NuGet SDK resolver only checks nuget.config files. https://github.com/Microsoft/msbuild/issues/2914 -->
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
<EnvironmentRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentRestoreSources>

1
src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj
View file

@ -6,7 +6,6 @@
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
<!-- SBRP builds before Arcade so it also needs the bootstrap Arcade version -->
<UseBootstrapArcade>true</UseBootstrapArcade>

1
src/SourceBuild/tarball/content/repos/source-build.proj
View file

@ -5,7 +5,6 @@
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
</PropertyGroup>
<ItemGroup>

1
src/SourceBuild/tarball/content/repos/sourcelink.proj
View file

@ -9,7 +9,6 @@
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
<!-- SourceLink builds before Arcade so it also needs the bootstrap Arcade version -->
<UseBootstrapArcade>true</UseBootstrapArcade>

1
src/SourceBuild/tarball/content/repos/symreader.proj
View file

@ -5,7 +5,6 @@
<PropertyGroup>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)nuget.config</NuGetConfigFile>
<PackagesOutput>$(ProjectDirectory)/artifacts/packages/$(Configuration)/Shipping</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
</PropertyGroup>

1
src/SourceBuild/tarball/content/repos/test-templates.proj
View file

@ -14,7 +14,6 @@
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</PackagesOutput>
</PropertyGroup>
<ItemGroup>

1
src/SourceBuild/tarball/content/repos/vstest.proj
View file

@ -14,7 +14,6 @@
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)/artifacts/$(Configuration)/packages</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>

1
src/SourceBuild/tarball/content/repos/xdt.proj
View file

@ -8,7 +8,6 @@
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/</PackagesOutput>
</PropertyGroup>
<ItemGroup>

3
src/SourceBuild/tarball/content/repos/xliff-tasks.proj
View file

@ -12,13 +12,12 @@
<BuildCommand>$(DotnetToolCommand) $(BuildCommandArgs)</BuildCommand>
<PackagesOutput>$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/</PackagesOutput>
<RepoApiImplemented>false</RepoApiImplemented>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
<IsToolingProject>true</IsToolingProject>
<NuGetConfigFile>$(ProjectDirectory)/NuGet.config</NuGetConfigFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<EnvironmentRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentRestoreSources>
<EnvironmentRestoreSources Condition="'$(OfflineBuild)' != 'true'">$(EnvironmentRestoreSources)%3Bhttps://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json</EnvironmentRestoreSources>