Merge release/3.0.1xx to master

eng/Version.Details.xml

@@ -3,17 +3,21 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19361.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19372.10">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f1b09644408f45f43f5835786b3e4bdfd2e78141</Sha>
+      <Sha>0793e2df782efc9ccae387bc779b2549208fa4a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19361.7">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19372.10">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f1b09644408f45f43f5835786b3e4bdfd2e78141</Sha>
+      <Sha>0793e2df782efc9ccae387bc779b2549208fa4a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="3.0.0-preview8-27911-01">
+    <Dependency Name="Microsoft.NET.HostModel" Version="3.0.0-preview8-28373-17">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>85dba54a1c451c736ef4861d112337cdfd95b890</Sha>
+      <Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.HostModel" Version="3.0.0-preview7-27902-19">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>fbe9466dddee8b3bbde6b706598d8f83802d08ce</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -15,16 +15,16 @@
     <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
-    <MicrosoftNETHostModelVersion>3.0.0-preview8-27911-01</MicrosoftNETHostModelVersion>
+    <MicrosoftNETHostModelVersion>3.0.0-preview8-28373-17</MicrosoftNETHostModelVersion>
     <NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
     <NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
-    <NuGetBuildTasksPackVersion>5.2.0-rtm.6067</NuGetBuildTasksPackVersion>
+    <NuGetBuildTasksPackVersion>5.3.0-preview.2.6103</NuGetBuildTasksPackVersion>
     <NuGetPackagingVersion>$(NuGetBuildTasksPackVersion)</NuGetPackagingVersion>
     <NuGetProjectModelVersion>$(NuGetBuildTasksPackVersion)</NuGetProjectModelVersion>
     <PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
     <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
-    <MicrosoftDotNetSignToolVersion>1.0.0-beta.19361.7</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetSignToolVersion>1.0.0-beta.19372.10</MicrosoftDotNetSignToolVersion>
   </PropertyGroup>
   <!-- Get .NET Framework reference assemblies from NuGet packages -->
   <PropertyGroup>

eng/common/init-tools-native.ps1

@@ -103,7 +103,13 @@ try {
       if ($LASTEXITCODE -Ne "0") {
         $errMsg = "$ToolName installation failed"
         if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
-            Write-Warning $errMsg
+            $showNativeToolsWarning = $true
+            if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
+                $showNativeToolsWarning = $false
+            }
+            if ($showNativeToolsWarning) {
+                Write-Warning $errMsg
+            }
             $toolInstallationFailure = $true
         } else {
             Write-Error $errMsg

eng/common/init-tools-native.sh

@@ -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

eng/common/pipeline-logging-functions.sh

@@ -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
+}

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

@@ -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'

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

@@ -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'

eng/common/tools.ps1

@@ -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

eng/common/tools.sh

@@ -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"

eng/restore-toolset.ps1

@@ -18,7 +18,7 @@ function InitializeCustomSDKToolset {
   InstallDotNetSharedFramework "1.0.5"
   InstallDotNetSharedFramework "1.1.2"
   InstallDotNetSharedFramework "2.1.0"
-  InstallDotNetSharedFramework "2.2.5"
+  InstallDotNetSharedFramework "2.2.6"
 
   CreateBuildEnvScript
   InstallNuget

eng/restore-toolset.sh

@@ -13,7 +13,7 @@ function InitializeCustomSDKToolset {
   InstallDotNetSharedFramework "1.0.5"
   InstallDotNetSharedFramework "1.1.2"
   InstallDotNetSharedFramework "2.1.0"
-  InstallDotNetSharedFramework "2.2.5"
+  InstallDotNetSharedFramework "2.2.6"
 }
 
 # Installs additional shared frameworks for testing purposes

global.json

@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview8-012830",
+    "dotnet": "3.0.100-preview8-013410",
     "vs-opt": {
       "version": "15.9"
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19361.7",
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19372.10",
     "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19215.12"
   }
 }

src/Assets/TestProjects/LinkTest/LinkTest/LinkTest.csproj

@@ -10,6 +10,8 @@
     <None Include="..\Linked\**\*.None.txt" LinkBase="Linked\Files" />
     <Content Include="..\Linked\**\*.Content.txt" LinkBase="Linked\Files" />
     <EmbeddedResource Include="..\Linked\**\*.Embedded.txt" LinkBase="Linked\Files" />
+    <Page Include="..\Linked\**\*.page.xaml" LinkBase="Linked\Files" />
+    <Resource Include="..\Linked\**\*.resource.xaml" LinkBase="Linked\Files" />
     <CustomItem Include="..\Linked\**\*.Custom.txt" LinkBase="Linked\Files" />
   </ItemGroup>
 
@@ -19,6 +21,8 @@
     <None Include="..\Linked\**\*.None.txt" />
     <Content Include="..\Linked\**\*.Content.txt" />
     <EmbeddedResource Include="..\Linked\**\*.Embedded.txt" />
+    <Page Include="..\Linked\**\*.page.xaml" />
+    <Resource Include="..\Linked\**\*.resource.xaml" />
     <CustomItem Include="..\Linked\**\*.Custom.txt" />
   </ItemGroup>
 
@@ -28,6 +32,8 @@
     <None Include="..\Linked\Linked.None.txt" LinkBase="Linked\Files"/>
     <Content Include="..\Linked\Linked.Content.txt" LinkBase="Linked\Files"/>
     <EmbeddedResource Include="..\Linked\Linked.Embedded.txt" LinkBase="Linked\Files"/>
+    <Page Include="..\Linked\Linked.page.xaml" LinkBase="Linked\Files"/>
+    <Resource Include="..\Linked\Linked.resource.xaml" LinkBase="Linked\Files"/>
     <CustomItem Include="..\Linked\*Linked.Custom.txt" LinkBase="Linked\Files"/>
   </ItemGroup>
 
@@ -37,6 +43,8 @@
     <None Include="..\Linked\Linked.None.txt" />
     <Content Include="..\Linked\Linked.Content.txt" />
     <EmbeddedResource Include="..\Linked\Linked.Embedded.txt" />
+    <Page Include="..\Linked\Linked.page.xaml" />
+    <Resource Include="..\Linked\Linked.resource.xaml" />
     <CustomItem Include="..\Linked\*Linked.Custom.txt" />
   </ItemGroup>
 
@@ -48,6 +56,8 @@
       <LinesToWrite Include="None%09%(None.FullPath)%09%(None.Link)" />
       <LinesToWrite Include="Content%09%(Content.FullPath)%09%(Content.Link)" />
       <LinesToWrite Include="EmbeddedResource%09%(EmbeddedResource.FullPath)%09%(EmbeddedResource.Link)" />
+      <LinesToWrite Include="Page%09%(Page.FullPath)%09%(Page.Link)" />
+      <LinesToWrite Include="Resource%09%(Resource.FullPath)%09%(Resource.Link)" />
       <LinesToWrite Include="CustomItem%09%(CustomItem.FullPath)%09%(CustomItem.Link)" />
     </ItemGroup>
 

src/Tasks/Common/Resources/Strings.resx

@@ -540,4 +540,16 @@ The following are names of parameters or literal values and should not be transl
     <value>NETSDK1108: ReadyToRun compilation will be skipped because it is only supported for executable projects.</value>
     <comment>{StrBegin="NETSDK1108: "}</comment>
   </data>
+  <data name="RuntimeListNotFound" xml:space="preserve">
+    <value>NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</value>
+    <comment>{StrBegin="NETSDK1109: "}</comment>
+  </data>
+  <data name="DuplicateRuntimePackAsset" xml:space="preserve">
+    <value>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</value>
+    <comment>{StrBegin="NETSDK1110: "}</comment>
+  </data>
+  <data name="FailedToDeleteApphost" xml:space="preserve">
+    <value>NETSDK1111: Failed to delete output apphost: {0}</value>
+    <comment>{StrBegin="NETSDK1111: "}</comment>
+  </data>
 </root>

src/Tasks/Common/Resources/xlf/Strings.cs.xlf

@@ -237,6 +237,11 @@
         <target state="translated">NETSDK1015: Token preprocesoru {0} získal více než jednu hodnotu. Volí se hodnota {1}.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicateRuntimePackAsset">
+        <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</source>
+        <target state="new">NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</target>
+        <note>{StrBegin="NETSDK1110: "}</note>
+      </trans-unit>
       <trans-unit id="EncounteredConflict_Info">
         <source>Encountered conflict between '{0}' and '{1}'.</source>
         <target state="new">Encountered conflict between '{0}' and '{1}'.</target>
@@ -262,6 +267,11 @@
         <target state="translated">NETSDK1060: Chyba při načítání souboru prostředků: {0}</target>
         <note>{StrBegin="NETSDK1060: "}</note>
       </trans-unit>
+      <trans-unit id="FailedToDeleteApphost">
+        <source>NETSDK1111: Failed to delete output apphost: {0}</source>
+        <target state="new">NETSDK1111: Failed to delete output apphost: {0}</target>
+        <note>{StrBegin="NETSDK1111: "}</note>
+      </trans-unit>
       <trans-unit id="FailedToLockResource">
         <source>NETSDK1077: Failed to lock resource.</source>
         <target state="translated">NETSDK1077: Nepovedlo se uzamknout prostředek.</target>
@@ -461,6 +471,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1028: Zadejte parametr RuntimeIdentifier.</target>
         <note>{StrBegin="NETSDK1028: "}</note>
       </trans-unit>
+      <trans-unit id="RuntimeListNotFound">
+        <source>NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</source>
+        <target state="new">NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</target>
+        <note>{StrBegin="NETSDK1109: "}</note>
+      </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
         <target state="translated">NETSDK1048: Cesty AdditionalProbingPaths byly zadány pro GenerateRuntimeConfigurationFiles, ale vynechávají se, protože RuntimeConfigDevPath je prázdné.</target>

src/Tasks/Common/Resources/xlf/Strings.de.xlf

@@ -237,6 +237,11 @@
         <target state="translated">NETSDK1015: Das Präprozessortoken "{0}" wurde mit mehreren Werten versehen. "{1}" wird als Wert ausgewählt.</target>
         <note>{StrBegin="NETSDK1015: "}</note>
       </trans-unit>
+      <trans-unit id="DuplicateRuntimePackAsset">
+        <source>NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</source>
+        <target state="new">NETSDK1110: More than one asset in the runtime pack has the same destination sub-path of '{0}'. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</target>
+        <note>{StrBegin="NETSDK1110: "}</note>
+      </trans-unit>
       <trans-unit id="EncounteredConflict_Info">
         <source>Encountered conflict between '{0}' and '{1}'.</source>
         <target state="new">Encountered conflict between '{0}' and '{1}'.</target>
@@ -262,6 +267,11 @@
         <target state="translated">NETSDK1060: Fehler beim Lesen der Ressourcendatei: {0}</target>
         <note>{StrBegin="NETSDK1060: "}</note>
       </trans-unit>
+      <trans-unit id="FailedToDeleteApphost">
+        <source>NETSDK1111: Failed to delete output apphost: {0}</source>
+        <target state="new">NETSDK1111: Failed to delete output apphost: {0}</target>
+        <note>{StrBegin="NETSDK1111: "}</note>
+      </trans-unit>
       <trans-unit id="FailedToLockResource">
         <source>NETSDK1077: Failed to lock resource.</source>
         <target state="translated">NETSDK1077: Fehler beim Sperren der Ressource.</target>
@@ -461,6 +471,11 @@ The following are names of parameters or literal values and should not be transl
         <target state="translated">NETSDK1028: Geben Sie einen RuntimeIdentifier an.</target>
         <note>{StrBegin="NETSDK1028: "}</note>
       </trans-unit>
+      <trans-unit id="RuntimeListNotFound">
+        <source>NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</source>
+        <target state="new">NETSDK1109: Runtime list file '{0}' was not found. Report this error to the .NET Core team here: https://aka.ms/dotnet-sdk-issue.</target>
+        <note>{StrBegin="NETSDK1109: "}</note>
+      </trans-unit>
       <trans-unit id="SkippingAdditionalProbingPaths">
         <source>NETSDK1048: 'AdditionalProbingPaths' were specified for GenerateRuntimeConfigurationFiles, but are being skipped because 'RuntimeConfigDevPath' is empty.</source>
         <target state="translated">NETSDK1048: Für GenerateRuntimeConfigurationFiles wurden "AdditionalProbingPaths" angegeben, sie werden jedoch übersprungen, weil "RuntimeConfigDevPath" leer ist.</target>