Commit graph

16779 commits

Author SHA1 Message Date
Jo Shields
077478e822 Genericize build script a bit better, for easier sharing between Linux/Mac 2023-12-15 09:07:49 -05:00
Jo Shields
8994ee567d Merge remote-tracking branch 'origin/main' into mac-vmr 2023-12-15 09:04:40 -05:00
dotnet-maestro[bot]
25dcfe15b0
[main] Update dependencies from dotnet/arcade (#17985)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
2023-12-15 12:47:35 +01:00
Jo Shields
085939a609
Merge branch 'main' into mac-vmr 2023-12-14 09:28:36 -05:00
Jo Shields
1a4672e257 More portable conditional 2023-12-14 09:28:14 -05:00
dotnet-maestro[bot]
afc2796202 Update dependencies from https://github.com/dotnet/arcade build 20231213.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23613.3
2023-12-14 13:26:51 +00:00
v-wuzhai
3479aaef8d
[main] Update dependencies from dotnet/sdk (#17961) 2023-12-14 10:20:18 +08:00
v-wuzhai
8e876c958d
[main] Update dependencies from dotnet/arcade (#17962) 2023-12-14 10:19:50 +08:00
dotnet-maestro[bot]
c56fb02646
[main] Update dependencies from dotnet/scenario-tests (#17968)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-12-14 00:09:54 +00:00
dotnet-maestro[bot]
3f671bb680 Update dependencies from https://github.com/dotnet/sdk build 20231213.6
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.6

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk
2023-12-13 23:17:41 +00:00
dotnet-maestro[bot]
8c98d582e3 Update dependencies from https://github.com/dotnet/sdk build 20231213.5
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.5

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk
2023-12-13 22:15:50 +00:00
dotnet-maestro[bot]
4dff7c253f Update dependencies from https://github.com/dotnet/sdk build 20231213.3
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.3

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk
2023-12-13 15:56:31 +00:00
Jo Shields
a7df14904b Merge remote-tracking branch 'origin/main' into mac-vmr 2023-12-13 09:04:19 -05:00
dotnet-maestro[bot]
b79375ac59 Update dependencies from https://github.com/dotnet/arcade build 20231212.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23611.2 -> To Version 9.0.0-beta.23612.2
2023-12-13 13:23:55 +00:00
dotnet-maestro[bot]
96ddcd4b98 Update dependencies from https://github.com/dotnet/sdk build 20231213.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.2

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets
 From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk
2023-12-13 11:00:17 +00:00
dotnet-maestro[bot]
c947c12af4
[main] Update dependencies from dotnet/sdk (#17875)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: JL03-Yue <59816815+JL03-Yue@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Marek Safar <marek.safar@gmail.com>
2023-12-13 11:57:28 +01:00
Jo Shields
4ba18be171
Merge branch 'main' into mac-vmr 2023-12-12 16:26:58 -05:00
Jo Shields
d450a51e85 Gotta pass CROSSCOMPILE=1 for x64 Macs to build osx-arm64 2023-12-12 15:44:05 -05:00
dotnet-maestro[bot]
c8ff354f70
[main] Update dependencies from dotnet/test-templates (#17948)
[main] Update dependencies from dotnet/test-templates
2023-12-12 16:04:41 +00:00
dotnet-maestro[bot]
40b58d4c65
[main] Update dependencies from dotnet/source-build-externals (#17950)
[main] Update dependencies from dotnet/source-build-externals
2023-12-12 16:03:03 +00:00
dotnet-maestro[bot]
db0e87e4f0
[main] Update dependencies from dotnet/arcade (#17949)
[main] Update dependencies from dotnet/arcade
2023-12-12 15:20:34 +00:00
Jo Shields
fec4d09a28 Merge remote-tracking branch 'origin/main' into mac-vmr 2023-12-12 09:57:39 -05:00
dotnet-maestro[bot]
f28f374a41 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231211.3
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 9.0.0-alpha.1.23611.2 -> To Version 9.0.0-alpha.1.23611.3
2023-12-11 22:56:40 +00:00
Matt Thalman
8d9388459a
[automated] Merge branch 'release/8.0.2xx' => 'main' (#17936) 2023-12-11 13:58:11 -06:00
dotnet-maestro[bot]
fa25ae0aa2
[main] Update dependencies from dotnet/source-build-reference-packages (#17941)
[main] Update dependencies from dotnet/source-build-reference-packages
2023-12-11 17:39:09 +00:00
Jo Shields
8cc18316d3 Merge remote-tracking branch 'origin/main' into mac-vmr 2023-12-11 10:44:49 -05:00
Jason Zhai
deb67c6570 Merge branch 'release/8.0.2xx' 2023-12-10 22:41:45 -08:00
dotnet-maestro[bot]
56bb481d62 Update dependencies from https://github.com/dotnet/sdk build 20231210.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.200-preview.23608.18 -> To Version 8.0.200-preview.23610.2

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.8.200-beta.23607.6 -> To Version 12.8.200-beta.23608.3 (parent: Microsoft.NET.Sdk
2023-12-11 03:08:22 +00:00
dotnet-maestro[bot]
403840a3d3 Update dependencies from https://github.com/dotnet/source-build-externals build 20231208.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 9.0.0-alpha.1.23605.1 -> To Version 9.0.0-alpha.1.23608.1
2023-12-09 13:22:46 +00:00
dotnet-maestro[bot]
4548efe441 Update dependencies from https://github.com/dotnet/sdk build 20231208.18
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.200-preview.23608.4 -> To Version 8.0.200-preview.23608.18

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.8.200-beta.23606.1 -> To Version 12.8.200-beta.23607.6 (parent: Microsoft.NET.Sdk
2023-12-09 00:56:59 +00:00
Jo Shields
2ab68b2bdc cd to build directory, since we aren't setting a Docker workdir 2023-12-08 15:58:57 -05:00
Jo Shields
38f4b80a0e Make VMR sync work on macOS 12, hopefully 2023-12-08 15:51:29 -05:00
Jo Shields
50bd7e3a26 Merge remote-tracking branch 'directhex/mac-vmr' into mac-vmr 2023-12-08 15:40:07 -05:00
Jo Shields
06c4afe326 more testing 2023-12-08 15:39:37 -05:00
Jo Shields
96e168982f
Merge branch 'main' into mac-vmr 2023-12-08 15:35:20 -05:00
dotnet-maestro[bot]
e450950e03 Update dependencies from https://github.com/dotnet/sdk build 20231208.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.200-preview.23608.4 -> To Version 8.0.200-preview.23608.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.8.200-beta.23606.1 -> To Version 12.8.200-beta.23607.6 (parent: Microsoft.NET.Sdk
2023-12-08 19:24:10 +00:00
Ella Hathaway
0485445c57
Remove Microsoft.SourceBuild.Intermediate from prebuilt baseline (#17935) 2023-12-08 12:51:16 -06:00
JL03-Yue
0e2753039b
[main] Update dependencies from dotnet/arcade (#17932) 2023-12-08 10:36:28 -08:00
Jo Shields
fc3bfe570b testing 2023-12-08 13:11:15 -05:00
Jo Shields
deecc351cf Add debug spew to figure out unreproducible Mac failure 2023-12-08 13:04:38 -05:00
Jo Shields
af8e0cc022 copy-paste error 2023-12-08 13:02:00 -05:00
dotnet-maestro[bot]
a00eb91d0e
[main] Update dependencies from dotnet/source-build-reference-packages (#17928)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-12-08 17:38:32 +00:00
Jo Shields
4bea290055 Flatten docker stuff a bit 2023-12-08 12:12:49 -05:00
Jo Shields
a4e452697e Fix child object mistake 2023-12-08 11:59:56 -05:00
Jo Shields
ff83a56433 Weird quoting 2023-12-08 11:56:29 -05:00
Jo Shields
84c4a02d4a Try an empty container to appease template 2023-12-08 11:54:40 -05:00
Jo Shields
749afddd02 Initial attempt at a Mac build 2023-12-08 11:51:37 -05:00
dotnet-maestro-bot
5037ea286a
[automated] Merge branch 'release/8.0.2xx' => 'main' (#17806)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-12-08 15:51:08 +01:00
dotnet-maestro[bot]
2e281e1124 Update dependencies from https://github.com/dotnet/arcade build 20231207.2
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks
 From Version 9.0.0-beta.23606.1 -> To Version 9.0.0-beta.23607.2
2023-12-08 13:24:21 +00:00
dotnet-maestro[bot]
888ed9f29e Update dependencies from https://github.com/dotnet/sdk build 20231208.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.200-preview.23608.1 -> To Version 8.0.200-preview.23608.4

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 17.9.0-preview-23604-01 -> To Version 17.9.0-preview-23606-01 (parent: Microsoft.NET.Sdk
2023-12-08 11:59:10 +00:00