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

merge

Browse source
This commit is contained in:
jonsequitur 2017-03-09 18:36:05 -08:00
commit 58bf70a476
100 changed files with 845 additions and 376 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
View file

@ -57,6 +57,7 @@ namespace Microsoft.DotNet.Cli.Build
{ "osx_x64", false },
{ "debian_x64", false },
{ "centos_x64", false },
{ "linux_x64", false },
};
if (!badges.ContainsKey(VersionBadgeMoniker))

4
build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs
View file

@ -13,16 +13,12 @@ namespace Microsoft.DotNet.Cli.Build
[Output]
public string Rid { get; set; }
[Output]
public string Architecture { get; set; }
[Output]
public string OSName { get; set; }
public override bool Execute()
{
Rid = RuntimeEnvironment.GetRuntimeIdentifier();
Architecture = RuntimeEnvironment.RuntimeArchitecture;
OSName = GetOSShortName();
return true;

7
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
View file

@ -7,6 +7,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<OutputPath>bin\$(Configuration)</OutputPath>
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback>
<!-- Specify a RID so that the runtime package with crossgen will be restored -->
<RuntimeIdentifiers>$(CoreCLRRid)</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
@ -31,5 +34,9 @@
<PackageReference Include="Microsoft.Build.Framework" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
<PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
<!-- This will cause the package with crossgen in it to be restored -->
<PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
</ItemGroup>
</Project>

2
build_projects/update-dependencies/update-dependencies.ps1
View file

@ -44,7 +44,7 @@ $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
# Generate some props files that are imported by update-dependencies
Write-Host "Generating property files..."
dotnet msbuild $RepoRoot\build.proj /p:Architecture=$Architecture /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
dotnet msbuild $RepoRoot\build.proj /p:Architecture=$Architecture /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
if($LASTEXITCODE -ne 0) { throw "Failed to generate intermidates" }
# Restore the app

2
build_projects/update-dependencies/update-dependencies.sh
View file

@ -44,7 +44,7 @@ export PATH=$DOTNET_INSTALL_DIR:$PATH
# Generate some props files that are imported by update-dependencies
echo "Generating property files..."
dotnet msbuild "$REPO_ROOT/build.proj" /p:Architecture=x64 /p:GeneratingPropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
dotnet msbuild "$REPO_ROOT/build.proj" /p:Architecture=x64 /p:GeneratePropsFile=true /t:WriteDynamicPropsToStaticPropsFiles
echo "Resotring $PROJECT_PATH..."
dotnet restore "$PROJECT_PATH"