Update dependencies from https://github.com/dotnet/arcade build 20210705.2 (#11048)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - XliffTasks: from 1.0.0-beta.21329.1 to 1.0.0-beta.21352.1 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
parent
f55cbb5495
commit
dc7ccf60bc
5 changed files with 38 additions and 8 deletions
|
@ -148,14 +148,14 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21351.2">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21355.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha>
|
<Sha>615fbd8c498067deae160a696701eaf33155da56</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21351.2">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21355.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>7f52af24016a4b749a2c1f219105c0f5a7100028</Sha>
|
<Sha>615fbd8c498067deae160a696701eaf33155da56</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
@ -171,9 +171,9 @@
|
||||||
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
|
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
|
||||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="XliffTasks" Version="1.0.0-beta.21329.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="XliffTasks" Version="1.0.0-beta.21352.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>45e08da009cf96a72c6b177a7e8f1fe6e6cac72c</Sha>
|
<Sha>dff6c8ede1bf9f95f09fccc2836dbc0564b853a1</Sha>
|
||||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21351.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21355.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -158,4 +158,10 @@ if ($dotnet5Source -ne $null) {
|
||||||
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$dotnet6Source = $sources.SelectSingleNode("add[@key='dotnet6']")
|
||||||
|
if ($dotnet6Source -ne $null) {
|
||||||
|
AddPackageSource -Sources $sources -SourceName "dotnet6-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
||||||
|
AddPackageSource -Sources $sources -SourceName "dotnet6-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
||||||
|
}
|
||||||
|
|
||||||
$doc.Save($filename)
|
$doc.Save($filename)
|
||||||
|
|
|
@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then
|
||||||
PackageSources+=('dotnet5-internal-transport')
|
PackageSources+=('dotnet5-internal-transport')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present
|
||||||
|
grep -i "<add key=\"dotnet6\"" $ConfigFile
|
||||||
|
if [ "$?" == "0" ]; then
|
||||||
|
grep -i "<add key=\"dotnet6-internal\"" $ConfigFile
|
||||||
|
if [ "$?" != "0" ]; then
|
||||||
|
echo "Adding dotnet6-internal to the packageSources."
|
||||||
|
PackageSourcesNodeFooter="</packageSources>"
|
||||||
|
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal/nuget/v2\" />"
|
||||||
|
|
||||||
|
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
|
||||||
|
fi
|
||||||
|
PackageSources+=('dotnet6-internal')
|
||||||
|
|
||||||
|
grep -i "<add key=\"dotnet6-internal-transport\">" $ConfigFile
|
||||||
|
if [ "$?" != "0" ]; then
|
||||||
|
echo "Adding dotnet6-internal-transport to the packageSources."
|
||||||
|
PackageSourcesNodeFooter="</packageSources>"
|
||||||
|
PackageSourceTemplate="${TB}<add key=\"dotnet6-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet6-internal-transport/nuget/v2\" />"
|
||||||
|
|
||||||
|
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
|
||||||
|
fi
|
||||||
|
PackageSources+=('dotnet6-internal-transport')
|
||||||
|
fi
|
||||||
|
|
||||||
# I want things split line by line
|
# I want things split line by line
|
||||||
PrevIFS=$IFS
|
PrevIFS=$IFS
|
||||||
IFS=$'\n'
|
IFS=$'\n'
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2",
|
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21355.2",
|
||||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
|
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue