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

Merge in 'release/8.0.2xx' changes

Browse source
This commit is contained in:
dotnet-bot 2024-02-16 15:31:11 +00:00
commit d374cc2ebf
8 changed files with 78 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eng/Version.Details.xml
View file

@ -227,13 +227,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>da98edc4c3ea539f109ea320672136ceb32591a7</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3">
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23621.3">
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23578.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri>

4
src/SourceBuild/content/eng/Versions.props
View file

@ -30,7 +30,7 @@
These URLs can't be composed from their base URL and version as we read them from the
prep.sh and pipeline scripts, outside of MSBuild.
-->
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.101-servicing.23601.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.101-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.102-servicing.24073.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.102-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
</PropertyGroup>
</Project>

2
src/SourceBuild/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.101"
"dotnet": "8.0.102"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",

1
src/SourceBuild/content/repo-projects/Directory.Build.props
View file

@ -110,6 +110,7 @@
<EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />
<EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
</ItemGroup>
<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">

3
src/VirtualMonoRepo/source-mappings.json
View file

@ -64,7 +64,8 @@
"name": "aspire",
"defaultRemote": "https://github.com/dotnet/aspire",
"exclude": [
"src/Aspire.Dashboard/**/*"
"src/Aspire.Dashboard/**/*",
"samples/**/*"
]
},
{

1
src/finalizer/CMakeLists.txt
View file

@ -55,6 +55,7 @@ target_link_libraries(Finalizer shell32.lib)
target_link_libraries(Finalizer advapi32.lib)
target_link_libraries(Finalizer version.lib)
target_link_libraries(Finalizer msi.lib)
target_link_libraries(Finalizer shlwapi.lib)
# Add WiX libraries
target_link_libraries(Finalizer wcautil.lib)

64
src/finalizer/finalizer.cpp
View file

@ -492,12 +492,64 @@ LExit:
return hr;
}
void RemoveInstallStateFile(LPWSTR sczSdkFeatureBandVersion, LPWSTR sczPlatform)
{
HRESULT hr = S_OK;
LPWSTR sczProgramData = NULL;
LPWSTR sczInstallStatePath = NULL;
LPWSTR sczPath = NULL;
hr = ShelGetFolder(&sczProgramData, CSIDL_COMMON_APPDATA);
ExitOnFailure(hr, "Failed to get shell folder.");
hr = PathConcat(sczProgramData, L"dotnet", &sczInstallStatePath);
ExitOnFailure(hr, "Failed to concat dotnet to install state path.");
hr = PathConcat(sczInstallStatePath, L"workloads", &sczInstallStatePath);
ExitOnFailure(hr, "Failed to concat workloads to install state path.");
hr = PathConcat(sczInstallStatePath, sczPlatform, &sczInstallStatePath);
ExitOnFailure(hr, "Failed to concat platform (%ls) to install state path.", sczPlatform);
hr = PathConcat(sczInstallStatePath, sczSdkFeatureBandVersion, &sczInstallStatePath);
ExitOnFailure(hr, "Failed to concat feature band (%ls) to install state path.", sczSdkFeatureBandVersion);
hr = PathConcat(sczInstallStatePath, L"installstate", &sczInstallStatePath);
ExitOnFailure(hr, "Failed to concat installstate to install state path.");
hr = PathConcat(sczInstallStatePath, L"default.json", &sczInstallStatePath);
ExitOnFailure(hr, "Failed to concat default.json to install state path.");
if (FileExistsEx(sczInstallStatePath, NULL))
{
LogStringLine(REPORT_STANDARD, "Deleting install state file: %ls", sczInstallStatePath);
hr = FileEnsureDelete(sczInstallStatePath);
ExitOnFailure(hr, "Failed to delete install state file: %ls", sczInstallStatePath);
hr = PathGetParentPath(sczInstallStatePath, &sczPath);
ExitOnFailure(hr, "Failed to get parent path of install state file.");
LogStringLine(REPORT_STANDARD, "Cleaning up empty workload folders.");
DirDeleteEmptyDirectoriesToRoot(sczPath, 0);
}
else
{
LogStringLine(REPORT_STANDARD, "Install state file does not exist: %ls", sczInstallStatePath);
}
LExit:
ReleaseStr(sczPath);
ReleaseStr(sczInstallStatePath)
ReleaseStr(sczProgramData);
}
int wmain(int argc, wchar_t* argv[])
{
HRESULT hr = S_OK;
DWORD dwExitCode = 0;
LPWSTR sczDependent = NULL;
LPWSTR sczFeatureBandVersion = NULL;
LPWSTR sczPlatform = NULL;
BOOL bRestartRequired = FALSE;
BOOL bSdkFeatureBandInstalled = FALSE;
int iMajor = 0;
@ -507,16 +559,19 @@ int wmain(int argc, wchar_t* argv[])
hr = ::Initialize(argc, argv);
ExitOnFailure(hr, "Failed to initialize.");
hr = StrAllocString(&sczPlatform, argv[3], 0);
ExitOnFailure(hr, "Failed to copy platform argument.");
// Convert the full SDK version to a feature band version
hr = ParseSdkVersion(argv[2], &sczFeatureBandVersion);
ExitOnFailure(hr, "Failed to parse version, %ls.", argv[2]);
// Create the dependent value, e.g., Microsoft.NET.Sdk,6.0.300,arm64
hr = StrAllocFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, argv[3]);
hr = StrAllocFormatted(&sczDependent, L"Microsoft.NET.Sdk,%ls,%ls", sczFeatureBandVersion, sczPlatform);
ExitOnFailure(hr, "Failed to create dependent.");
LogStringLine(REPORT_STANDARD, "Setting target dependent to %ls.", sczDependent);
hr = ::DetectSdk(sczFeatureBandVersion, argv[3], &bSdkFeatureBandInstalled);
hr = ::DetectSdk(sczFeatureBandVersion, sczPlatform, &bSdkFeatureBandInstalled);
ExitOnFailure(hr, "Failed to detect installed SDKs.");
// If the feature band is still present, do not remove workloads.
@ -529,7 +584,7 @@ int wmain(int argc, wchar_t* argv[])
hr = ::RemoveDependent(sczDependent, &bRestartRequired);
ExitOnFailure(hr, "Failed to remove dependent \"%ls\".", sczDependent);
hr = ::DeleteWorkloadRecords(sczFeatureBandVersion, argv[3]);
hr = ::DeleteWorkloadRecords(sczFeatureBandVersion, sczPlatform);
ExitOnFailure(hr, "Failed to remove workload records.");
if (bRestartRequired)
@ -537,9 +592,12 @@ int wmain(int argc, wchar_t* argv[])
dwExitCode = ERROR_SUCCESS_REBOOT_REQUIRED;
}
RemoveInstallStateFile(sczFeatureBandVersion, sczPlatform);
LExit:
ReleaseStr(sczDependent);
ReleaseStr(sczFeatureBandVersion);
ReleaseStr(sczPlatform);
LogUninitialize(TRUE);
RegUninitialize();
WiuUninitialize();

6
src/finalizer/precomp.h
View file

@ -12,6 +12,8 @@
#include <winreg.h>
#include <msi.h>
#include <pathcch.h>
#include <shlobj.h>
#include <shlwapi.h>
// Configure some logging parameters for WiX
#define ExitTrace LogErrorString
@ -26,3 +28,7 @@
#include "pathutil.h"
#include "strutil.h"
#include "wiutil.h"
#include "dirutil.h"
#include "fileutil.h"
#include "shelutil.h"