mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/dotnet/installer into merge/release/7.0.2xx-to-main

Browse source
This commit is contained in:
MichaelSimons 2023-01-03 22:46:59 +00:00
commit 35b016aa82
12 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.darc": {
"version": "1.1.0-beta.22620.1",
"version": "1.1.0-beta.23053.1",
"commands": [
"darc"
]

11
.vsts-ci.yml
View file

@ -373,12 +373,11 @@ stages:
# the VMR synchronization step is run to validate that the PR can be merged and later
# synchronized into the VMR without problems.
# You can do this by allowing the Synchronize_VMR stage from above in PRs.
# TODO - Temporarily disabled (https://github.com/dotnet/source-build/issues/3184)
# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
# - template: eng/pipelines/templates/stages/vmr-build.yml
# parameters:
# vmrBranch: ${{ parameters.vmrBranch }}
# isBuiltFromVmr: false
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
- template: eng/pipelines/templates/stages/vmr-build.yml
parameters:
vmrBranch: ${{ parameters.vmrBranch }}
isBuiltFromVmr: false
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- stage: Publish

8
eng/Version.Details.xml
View file

@ -205,13 +205,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb37e1f67041bfc6484ec47525bda461606efe92</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.22620.1">
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23053.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>a15b2ccfd23a56ac9314ce91ea2d00f514b29856</Sha>
<Sha>11dfc0ff33280c18db03a2108673a41ade41fd55</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.22620.1">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23053.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>a15b2ccfd23a56ac9314ce91ea2d00f514b29856</Sha>
<Sha>11dfc0ff33280c18db03a2108673a41ade41fd55</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>

2
eng/Versions.props
View file

@ -30,7 +30,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.22620.1</MicrosoftDotNetDarcLibVersion>
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.23053.1</MicrosoftDotNetDarcLibVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

0
src/SourceBuild/content/build.sh Normal file → Executable file
View file

0
src/SourceBuild/content/eng/install-nuget-credprovider.sh Normal file → Executable file
View file

0
src/SourceBuild/content/prep.sh Normal file → Executable file
View file

0
src/SourceBuild/content/prereqs/packages/archive/_ Normal file
View file

0
src/SourceBuild/content/prereqs/packages/prebuilt/_ Normal file
View file

6
src/SourceBuild/content/repo-projects/aspnetcore.proj
View file

@ -3,9 +3,9 @@
<PropertyGroup>
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</OverrideTargetRid>
<!-- StandardSourceBuildArgs include -publish which is not supported by the aspnetcore build script. -->
<BuildCommandArgs>$(StandardSourceBuildArgs.Replace('--publish', ''))</BuildCommandArgs>

6
src/SourceBuild/content/repo-projects/installer.proj
View file

@ -7,9 +7,9 @@
<PropertyGroup>
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</OverrideTargetRid>
<OSNameOverride>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</OSNameOverride>
<!-- Determine target portable rid based on bootstrap SDK's portable rid -->

6
src/SourceBuild/content/repo-projects/runtime.proj
View file

@ -8,9 +8,9 @@
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-$(Platform)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-$(Platform)</OverrideTargetRid>
<OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</OverrideTargetRid>
<_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
<RuntimeOS>$(NETCoreSdkRuntimeIdentifier.Substring(0, $(_platformIndex)))</RuntimeOS>