mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
28418 commits 41 branches 190 tags 96 MiB
Commit graph

28418 commits

This branch
This branch
All branches
Author SHA1 Message Date
dotnet-maestro-bot
1b456c2e56
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#14747) 
* [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726)

* [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)

* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch

* update global.json and Versions.props for .NET SDK 6.0.110 (#14717)

* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Disable source-build tarball validation for non 6.0.1xx legs

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>

* Update asp.net templates (#14687)

* Update asp.net templates (#14688)

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
 2022-10-13 12:22:16 -05:00
dotnet-maestro[bot]
08b71c2e64 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221013.3 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22504.2 -> To Version 7.0.0-alpha.1.22513.3
 2022-10-13 17:19:42 +00:00
MichaelSimons
5ba97740fe Remove backported source-build patch 2022-10-13 17:19:24 +00:00
dotnet-maestro[bot]
8f29cee5b0 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221013.2 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.22507.2 -> To Version 8.0.0-alpha.1.22513.2
 2022-10-13 15:32:07 +00:00
dotnet-maestro[bot]
27644ec236 Update dependencies from https://github.com/dotnet/sdk build 20221013.6 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200-preview.22513.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
 2022-10-13 14:34:24 +00:00
dotnet-maestro[bot]
1313e59437 Update dependencies from https://github.com/dotnet/sdk build 20221013.5 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200-preview.22513.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
 2022-10-13 13:19:59 +00:00
dotnet-bot
cd4fd1f182 Merge in 'release/7.0.1xx' changes 2022-10-13 13:16:39 +00:00
Logan Bussell
d41bfecf50
[release/7.0.1xx] Port dotnet-watch smoke test fixes (#14738) 
* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Re-enable dotnet-watch test
 2022-10-13 08:05:35 -05:00
dotnet-maestro[bot]
dcb6f574ed Update dependencies from https://github.com/dotnet/arcade build 20221012.1 
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 8.0.0-beta.22511.1 -> To Version 8.0.0-beta.22512.1
 2022-10-13 12:34:20 +00:00
dotnet-maestro[bot]
659bfc43fb Update dependencies from https://github.com/dotnet/sdk build 20221013.4 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.22512.46 -> To Version 8.0.100-alpha.1.22513.4
 2022-10-13 10:50:05 +00:00
dotnet-bot
ffee7bfe73 Merge in 'release/6.0.3xx' changes 2022-10-13 10:31:45 +00:00
dotnet-bot
fa05489ba9 Merge in 'release/6.0.4xx' changes 2022-10-13 10:31:31 +00:00
v-wuzhai
f495edeea3
Merge pull request #14746 from dotnet/darc-main-3b8e9cc9-596a-421b-a8ce-37b00e03c425 
[main] Update dependencies from dotnet/sdk
 2022-10-13 03:21:30 -07:00
v-wuzhai
8226f3fd22
Merge pull request #14744 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
 2022-10-13 03:20:25 -07:00
v-wuzhai
e8d067492e
Merge pull request #14743 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx 
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
 2022-10-13 03:20:06 -07:00
dotnet-maestro[bot]
c72d666b2c Update dependencies from https://github.com/dotnet/sdk build 20221013.2 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200-preview.22513.2

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
 2022-10-13 09:44:59 +00:00
dotnet-maestro[bot]
40d563778f Dependency coherency updates 
Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
 2022-10-13 08:10:48 +00:00
dotnet-maestro[bot]
b20134e23a Update dependencies from https://github.com/dotnet/sdk build 20221012.40 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.200-preview.22512.36 -> To Version 7.0.200-preview.22512.40
 2022-10-13 08:10:34 +00:00
dotnet-maestro[bot]
6378013642 Update dependencies from https://github.com/dotnet/sdk build 20221012.36 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200-preview.22512.36
 2022-10-13 08:10:22 +00:00
dotnet-maestro[bot]
53243e5272 Update dependencies from https://github.com/dotnet/sdk build 20221012.46 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.22512.42 -> To Version 8.0.100-alpha.1.22512.46

Dependency coherency updates

Microsoft.Build
 From Version 17.5.0-preview-22510-01 -> To Version 17.5.0-preview-22511-01 (parent: Microsoft.NET.Sdk
 2022-10-13 07:49:29 +00:00
v-wuzhai
87aeee61c4
Merge pull request #14745 from dotnet/darc-main-5952fa79-391e-4d9e-b343-9504d454accf 
[main] Update dependencies from dotnet/sdk
 2022-10-13 00:29:37 -07:00
dotnet-maestro[bot]
3e31e8be52 Update dependencies from https://github.com/dotnet/sdk build 20221012.42 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.22512.39 -> To Version 8.0.100-alpha.1.22512.42

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk
 From Version 8.0.0-alpha.1.22507.3 -> To Version 8.0.0-alpha.1.22510.1 (parent: Microsoft.NET.Sdk
 2022-10-13 05:57:07 +00:00
v-wuzhai
45484e72fb
Merge pull request #14730 from dotnet/darc-main-d3a19352-982f-485d-8dfd-744c97cfdbc7 
[main] Update dependencies from dotnet/sdk
 2022-10-12 22:56:06 -07:00
dotnet-maestro[bot]
a8113d8374 Update dependencies from https://github.com/dotnet/sdk build 20221012.39 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.22511.14 -> To Version 8.0.100-alpha.1.22512.39

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 8.0.0-alpha.1.22510.12 -> To Version 8.0.0-alpha.1.22512.9 (parent: Microsoft.NET.Sdk
 2022-10-13 05:01:21 +00:00
dotnet-maestro[bot]
b50d86d635 Update dependencies from https://github.com/dotnet/sdk build 20221012.38 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.22511.14 -> To Version 8.0.100-alpha.1.22512.38

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 8.0.0-alpha.1.22510.12 -> To Version 8.0.0-alpha.1.22512.9 (parent: Microsoft.NET.Sdk
 2022-10-13 04:09:34 +00:00
dotnet-maestro[bot]
d3252f60b1 Update dependencies from https://github.com/dotnet/sdk build 20221012.32 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200-preview.22512.32

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
 2022-10-13 04:05:24 +00:00
v-wuzhai
f3c9c17536
Merge pull request #14739 from dotnet-maestro-bot/merge/release/7.0.2xx-to-main 
[automated] Merge branch 'release/7.0.2xx' => 'main'
 2022-10-12 19:38:10 -07:00
Jason Zhai
2d5b0894c2 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 19:36:30 -07:00
dotnet-bot
cbfaafcfa6 Merge in 'release/7.0.1xx' changes 2022-10-13 02:33:36 +00:00
dotnet-maestro[bot]
687adef387 Update dependencies from https://github.com/dotnet/sdk build 20221012.33 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.22511.14 -> To Version 8.0.100-alpha.1.22512.33

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 8.0.0-alpha.1.22510.12 -> To Version 8.0.0-alpha.1.22512.9 (parent: Microsoft.NET.Sdk
 2022-10-13 02:31:21 +00:00
Jason Zhai
808d78865b Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-10-12 19:28:52 -07:00
v-wuzhai
5d80bf0a65
Merge pull request #14737 from dotnet-maestro-bot/merge/release/6.0.4xx-to-release/7.0.1xx 
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx'
 2022-10-12 19:24:26 -07:00
William Godbe
1a77d838c5
Update asp.net templates (#14686) 2022-10-13 01:51:21 +00:00
dotnet-maestro[bot]
7cbf348c70 Update dependencies from https://github.com/dotnet/sdk build 20221012.30 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-alpha.1.22511.14 -> To Version 8.0.100-alpha.1.22512.30

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.5-beta.22507.6 -> To Version 12.0.5-beta.22510.6 (parent: Microsoft.NET.Sdk
 2022-10-13 01:33:47 +00:00
dotnet-bot
fb0b3e448f Merge in 'release/7.0.1xx' changes 2022-10-13 01:27:01 +00:00
William Godbe
9a76ba2452
Update asp.net templates (#14689) 2022-10-13 01:16:20 +00:00
William Godbe
f71c1dddf1
Update asp.net templates (#14690) 
* Update asp.net templates

* Update GenerateBundledVersions.targets
 2022-10-13 00:12:29 +00:00
dotnet-bot
b6e7cc35cc Merge in 'release/6.0.4xx' changes 2022-10-12 23:59:24 +00:00
dotnet-bot
46766171dc Merge in 'release/6.0.3xx' changes 2022-10-12 23:54:53 +00:00
William Godbe
ab2fa01742
Update asp.net templates (#14688) 2022-10-12 23:48:00 +00:00
William Godbe
0de6184891
Update asp.net templates (#14687) 2022-10-12 23:43:50 +00:00
dotnet-maestro[bot]
6d10463332 Update dependencies from https://github.com/dotnet/sdk build 20221012.26 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22506.24 -> To Version 7.0.200-preview.22512.26

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0 (parent: Microsoft.NET.Sdk
 2022-10-12 23:43:30 +00:00
dotnet-bot
81f3e48d0c Merge in 'release/6.0.4xx' changes 2022-10-12 22:41:36 +00:00
Marc Paine
b06e9b8b77
Merge branch 'main' into merge/release/7.0.2xx-to-main 2022-10-12 15:33:04 -07:00
Marc Paine
185c87b36c
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2022-10-12 15:32:32 -07:00
Marc Paine
216b75ce9c
Merge pull request #14742 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx 
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
 2022-10-12 15:30:16 -07:00
dotnet-bot
7895b716e0 Merge in 'release/7.0.1xx' changes 2022-10-12 21:44:16 +00:00
Marc Paine
f982f388ce
Merge pull request #14718 from dotnet/nagilson-tempfix-7.0.1xx 
[7.0.1xx] Use mktemp to correctly use temp files
 2022-10-12 14:33:13 -07:00
dotnet-bot
24f86f2a44 Merge in 'release/6.0.3xx' changes 2022-10-12 21:25:39 +00:00
dotnet-maestro-bot
0263b7b7da
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726) 
* [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)

* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch

* update global.json and Versions.props for .NET SDK 6.0.110 (#14717)

* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Disable source-build tarball validation for non 6.0.1xx legs

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
 2022-10-12 16:14:53 -05:00