From 4ed8c5bd5b84b78fb342011b6f63eb3bfcfd2b74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 19:02:10 +0000 Subject: [PATCH 1/8] [main] Update dependencies from dotnet/arcade (#1094) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/generate-locproject.ps1 | 13 ++++++++++--- global.json | 2 +- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bae44b0..cb416097 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 28a6403ee97077256fcdc60f599f0ad9e38e3cfa https://github.com/dotnet/arcade-services diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index de348a2e..25e97ac0 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -25,8 +25,15 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to # Template files $jsonFiles = @() -$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern -$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern +$jsonTemplateFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" + $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $xlfFiles = @() @@ -44,7 +51,7 @@ $langXlfFiles | ForEach-Object { $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru } -$locFiles = $jsonFiles + $xlfFiles +$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles $locJson = @{ Projects = @( diff --git a/global.json b/global.json index d9728763..fe4b9a20 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2" } } From 072de978b7d2882c3433e37e5f1c8349b622bb98 Mon Sep 17 00:00:00 2001 From: Phillip Hoff Date: Fri, 25 Jun 2021 11:07:08 -0700 Subject: [PATCH 2/8] Update CODEOWNERS. (#1101) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ee054bed..5688a29b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,4 @@ # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths. # See https://help.github.com/articles/about-code-owners/ -* @jkotalik @rynowak @davidfowl @juntaoluo +* @philliphoff @pratiksanglikar From 5096dc54c3dc9daf71f67b2ebd919f726ca3aaf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 25 Jun 2021 18:10:09 +0000 Subject: [PATCH 3/8] [main] Update dependencies from dotnet/arcade (#1098) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.ps1 | 11 ++++++++++- global.json | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb416097..ea6fa3c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + a68ec1edf328e737b31a09cb49e1929c28e91d0c - + https://github.com/dotnet/arcade - 28a6403ee97077256fcdc60f599f0ad9e38e3cfa + a68ec1edf328e737b31a09cb49e1929c28e91d0c https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5619c7aa..7942ffaf 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } - return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe" + + $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" + $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } + if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { + $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" + } else { + $global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe" + } + + return $global:_MSBuildExe } function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) { diff --git a/global.json b/global.json index fe4b9a20..58e8969c 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3" } } From c04c84f786581719cea6b172e0f6857a112cdf3e Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Fri, 25 Jun 2021 16:13:59 -0300 Subject: [PATCH 4/8] Add dockerfile build args documentation (#1095) * Add dockerfile args docs * Add dockerFileArgs to tye-schema.json --- docs/reference/schema.md | 4 ++++ src/schema/tye-schema.json | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/docs/reference/schema.md b/docs/reference/schema.md index 8b5e508f..4c4856d5 100644 --- a/docs/reference/schema.md +++ b/docs/reference/schema.md @@ -162,6 +162,10 @@ Including `image` marks the service as a *container*: The Dockerfile to build from. Uses the name of the service as the name of the image. Only supported for `tye run` currently. +#### `dockerFileArgs` (`string[]`) + +Build arguments to use when building a Docker image. This is only used when `dockerFile` is specified. + #### `dockerFileContext` (string) Path to the Dockerfile Context to run docker build against. This is only used when `dockerFile` is specified as well. diff --git a/src/schema/tye-schema.json b/src/schema/tye-schema.json index 65060d74..90ca4f6d 100644 --- a/src/schema/tye-schema.json +++ b/src/schema/tye-schema.json @@ -383,6 +383,13 @@ "description": "The Dockerfile to use.", "type": "string" }, + "dockerFileArgs": { + "description": "Build arguments to use when building the image.", + "type": "array", + "items": { + "type": "object" + } + }, "dockerFileContext": { "description": "The Dockerfile context to run docker build on.", "type": "string" From 6d3cb96ebd3c14e2af8f1cf4bcafea082b06bf87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 29 Jun 2021 14:30:22 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/arcade build 20210628.2 (#1103) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/tools.ps1 | 2 +- global.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea6fa3c9..fe396360 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 - + https://github.com/dotnet/arcade - a68ec1edf328e737b31a09cb49e1929c28e91d0c + 685c1a4fa207d81e881a402a32ffa1c0fb191b42 https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7942ffaf..4b255203 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -380,7 +380,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = $msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" } $local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin" - $local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false } + $local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false } if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) { $global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe" } else { diff --git a/global.json b/global.json index 58e8969c..ee6cbc43 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2" } } From 124f35acb0590fa4a0c12a3b20cccbb859c1e173 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 1 Jul 2021 12:41:35 +0000 Subject: [PATCH 6/8] [main] Update dependencies from dotnet/arcade (#1104) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe396360..28d13f2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 685c1a4fa207d81e881a402a32ffa1c0fb191b42 + 26345756f99087811b1fe4d02ff213eb172ec506 - + https://github.com/dotnet/arcade - 685c1a4fa207d81e881a402a32ffa1c0fb191b42 + 26345756f99087811b1fe4d02ff213eb172ec506 - + https://github.com/dotnet/arcade - 685c1a4fa207d81e881a402a32ffa1c0fb191b42 + 26345756f99087811b1fe4d02ff213eb172ec506 - + https://github.com/dotnet/arcade - 685c1a4fa207d81e881a402a32ffa1c0fb191b42 + 26345756f99087811b1fe4d02ff213eb172ec506 - + https://github.com/dotnet/arcade - 685c1a4fa207d81e881a402a32ffa1c0fb191b42 + 26345756f99087811b1fe4d02ff213eb172ec506 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index ee6cbc43..e8367fe3 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21328.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2" } } From fc0ab39f1bd2f1cd4d5b5c0a07f66f61a44263ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 2 Jul 2021 12:36:03 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/arcade build 20210701.2 (#1106) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- global.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28d13f2f..0c83f1fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 7f52af24016a4b749a2c1f219105c0f5a7100028 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 7f52af24016a4b749a2c1f219105c0f5a7100028 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 7f52af24016a4b749a2c1f219105c0f5a7100028 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 7f52af24016a4b749a2c1f219105c0f5a7100028 - + https://github.com/dotnet/arcade - 26345756f99087811b1fe4d02ff213eb172ec506 + 7f52af24016a4b749a2c1f219105c0f5a7100028 https://github.com/dotnet/arcade-services diff --git a/global.json b/global.json index e8367fe3..029bfde9 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21330.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2" } } From 47416fecf020a8e38c2132584649d6ef05e61aaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Jul 2021 12:41:08 +0000 Subject: [PATCH 8/8] [main] Update dependencies from dotnet/arcade (#1111) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 20 ++++++++++---------- eng/common/SetupNugetSources.ps1 | 6 ++++++ eng/common/SetupNugetSources.sh | 24 ++++++++++++++++++++++++ global.json | 2 +- 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c83f1fe..4b8e2cf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 7f52af24016a4b749a2c1f219105c0f5a7100028 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 7f52af24016a4b749a2c1f219105c0f5a7100028 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 7f52af24016a4b749a2c1f219105c0f5a7100028 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 7f52af24016a4b749a2c1f219105c0f5a7100028 + 286d98094b830b8dad769542b2669cb1b75f7097 - + https://github.com/dotnet/arcade - 7f52af24016a4b749a2c1f219105c0f5a7100028 + 286d98094b830b8dad769542b2669cb1b75f7097 https://github.com/dotnet/arcade-services diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a0b5fc37..18823840 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -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 } +$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) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 2734601c..ad3fb74f 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,6 +129,30 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet5-internal-transport') fi +# Ensure dotnet6-internal and dotnet6-internal-transport are in the packageSources if the public dotnet6 feeds are present +grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet6-internal') + + grep -i "" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding dotnet6-internal-transport to the packageSources." + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet6-internal-transport') +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/global.json b/global.json index 029bfde9..79f028dd 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21351.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3" } }