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

Merging/resolving conflicts.

Browse source
This commit is contained in:
jbeisner 2019-07-22 15:56:48 +00:00
commit 98c9752985
10 changed files with 140 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

56
eng/Version.Details.xml
View file

@ -2,57 +2,57 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview8-27917-01">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview8-27919-09">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7cf49f78deaae14948ce59fc6d9266365888f7b6</Sha>
<Sha>3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-27917-01">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-27919-09">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7cf49f78deaae14948ce59fc6d9266365888f7b6</Sha>
<Sha>3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview8-27917-01">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview8-27919-09">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7cf49f78deaae14948ce59fc6d9266365888f7b6</Sha>
<Sha>3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview8.19367.2">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview8.19371.5">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>f4f5b16e9305d54d27aefe0076cf153efab7e119</Sha>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview8.19367.2">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview8.19371.5">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>f4f5b16e9305d54d27aefe0076cf153efab7e119</Sha>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview8.19367.2">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview8.19371.5">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>f4f5b16e9305d54d27aefe0076cf153efab7e119</Sha>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview8.19367.2">
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview8.19371.5">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>f4f5b16e9305d54d27aefe0076cf153efab7e119</Sha>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview8.19367.2">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview8.19371.5">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>f4f5b16e9305d54d27aefe0076cf153efab7e119</Sha>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-preview8.19367.2">
<Dependency Name="dotnet-watch" Version="3.0.0-preview8.19371.5">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>f4f5b16e9305d54d27aefe0076cf153efab7e119</Sha>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19365.2">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19370.1">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>326a2514f7162dfb8ec928f879336aa434576473</Sha>
<Sha>b103c4a9c64f62b8d940cc651b41fe774435f478</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview8.19367.9">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview8.19371.3">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>b7d29e3f68a9bd7a82e68459b538599baae4904b</Sha>
<Sha>be81e8e373471bdd43a096697807c55f9053a3c0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview8.19367.2">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview8.19370.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>bd8cce7843a5b3f431e1011b1ca061d378197d41</Sha>
<Sha>ec9f5fc673f798dd6a89c7d11a4e62727837757c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview8.19367.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview8.19370.6">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>b52c9eb3862d88e685bbcfa9360ee5518b38bd9f</Sha>
<Sha>df36ae42215c0ec93ea493e6b5af45991b2c2c29</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview8.19359.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
@ -65,9 +65,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19366.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19369.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0dd5e2025f0049c133a8706f40e4463b193e5d17</Sha>
<Sha>a190d4865fe3c86a168ec49c4fc61c90c96ae051</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

24
eng/Versions.props
View file

@ -12,31 +12,31 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview8.19367.9</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview8.19371.3</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview8.19367.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview8.19367.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview8.19367.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview8.19367.2</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview8.19367.2</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview8.19367.2</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview8.19371.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview8.19371.5</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview8.19371.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview8.19371.5</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview8.19371.5</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview8.19371.5</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview8.19367.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview8.19370.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.0.100-preview8.19367.2</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-preview8.19370.4</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview8-27917-01</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview8-27919-09</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
@ -44,11 +44,11 @@
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview8-27917-01</NETStandardLibraryRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview8-27919-09</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview8-27917-01</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview8-27919-09</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>

11
eng/build.yml
View file

@ -37,6 +37,7 @@ phases:
- group: DotNet-Symbol-Server-PATs
- group: DotNet-HelixApi-Access
- _DotNetPublishToBlobFeed: true
- _PushToVSFeed: true
- _SignType: real
- _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
@ -98,6 +99,16 @@ phases:
$(_AdditionalBuildParameters)
displayName: Build
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.agentOs, 'Windows_NT')) }}:
- task: NuGetCommand@2
displayName: Push Visual Studio NuPkgs
inputs:
command: push
packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/VS.*.nupkg'
nuGetFeedType: external
publishFeedCredentials: 'DevDiv - VS package feed'
condition: and(succeeded(), eq(variables['_PushToVSFeed'], 'true'), eq(variables['_DotNetPublishToBlobFeed'], 'true'), or(eq(variables['_BuildArchitecture'], 'x64'), eq(variables['_BuildArchitecture'], 'x86')))
- task: PublishTestResults@1
displayName: Publish Test Results
inputs:

2
eng/common/init-tools-native.sh
View file

@ -71,7 +71,7 @@ function ReadGlobalJsonNativeTools {
local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}')
native_tools_list=${native_tools_list//[\" ]/}
native_tools_list=${native_tools_list//,/$'\n'}
native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')"
native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[[:space:]]')"
local old_IFS=$IFS
while read -r line; do

82
eng/common/pipeline-logging-functions.sh
View file

@ -39,11 +39,11 @@ function Write-PipelineTaskError {
return
fi
message_type="error"
sourcepath=''
linenumber=''
columnnumber=''
error_code=''
local message_type="error"
local sourcepath=''
local linenumber=''
local columnnumber=''
local error_code=''
while [[ $# -gt 0 ]]; do
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
@ -76,7 +76,7 @@ function Write-PipelineTaskError {
shift
done
message="##vso[task.logissue"
local message="##vso[task.logissue"
message="$message type=$message_type"
@ -100,3 +100,73 @@ function Write-PipelineTaskError {
echo "$message"
}
function Write-PipelineSetVariable {
if [[ "$ci" != true ]]; then
return
fi
local name=''
local value=''
local secret=false
local as_output=false
local is_multi_job_variable=true
while [[ $# -gt 0 ]]; do
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
case "$opt" in
-name|-n)
name=$2
shift
;;
-value|-v)
value=$2
shift
;;
-secret|-s)
secret=true
;;
-as_output|-a)
as_output=true
;;
-is_multi_job_variable|-i)
is_multi_job_variable=$2
shift
;;
esac
shift
done
value=${value/;/%3B}
value=${value/\\r/%0D}
value=${value/\\n/%0A}
value=${value/]/%5D}
local message="##vso[task.setvariable variable=$name;isSecret=$secret;isOutput=$is_multi_job_variable]$value"
if [[ "$as_output" == true ]]; then
$message
else
echo "$message"
fi
}
function Write-PipelinePrependPath {
local prepend_path=''
while [[ $# -gt 0 ]]; do
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
case "$opt" in
-path|-p)
prepend_path=$2
shift
;;
esac
shift
done
export PATH="$prepend_path:$PATH"
if [[ "$ci" == true ]]; then
echo "##vso[task.prependpath]$prepend_path"
fi
}

1
eng/common/templates/post-build/channels/internal-servicing.yml
View file

@ -84,6 +84,7 @@ stages:
/p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName)
/p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1)
/p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url)
/p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url)
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com'

1
eng/common/templates/post-build/channels/public-release.yml
View file

@ -84,6 +84,7 @@ stages:
/p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName)
/p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1)
/p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url)
/p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url)
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com'

2
eng/common/tools.ps1
View file

@ -169,7 +169,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
InstallDotNet $dotnetRoot $version $architecture
}
function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot
function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) {
$installScript = GetDotNetInstallScript $dotnetRoot
$installParameters = @{
Version = $version

19
eng/common/tools.sh
View file

@ -146,14 +146,10 @@ function InitializeDotNetCli {
# Add dotnet to PATH. This prevents any bare invocation of dotnet in custom
# build steps from using anything other than what we've downloaded.
export PATH="$dotnet_root:$PATH"
Write-PipelinePrependPath -path "$dotnet_root"
if [[ $ci == true ]]; then
# Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
echo "##vso[task.prependpath]$dotnet_root"
echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0"
echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1"
fi
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
# return value
_InitializeDotNetCli="$dotnet_root"
@ -387,7 +383,8 @@ mkdir -p "$toolset_dir"
mkdir -p "$temp_dir"
mkdir -p "$log_dir"
if [[ $ci == true ]]; then
export TEMP="$temp_dir"
export TMP="$temp_dir"
fi
Write-PipelineSetVariable -name "Artifacts" -value "$artifacts_dir"
Write-PipelineSetVariable -name "Artifacts.Toolset" -value "$toolset_dir"
Write-PipelineSetVariable -name "Artifacts.Log" -value "$log_dir"
Write-PipelineSetVariable -name "Temp" -value "$temp_dir"
Write-PipelineSetVariable -name "TMP" -value "$temp_dir"

2
global.json
View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview6-012264"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19366.4"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19369.2"
}
}