Marc Paine
GitHub
commit
789b3b05e8
18 changed files with 24 additions and 24 deletions
|
|
@ -60,8 +60,8 @@ while (($# > 0)); do
|
|||
echo " - (default) %USERPROFILE%/.netcoreeng/native"
|
||||
echo ""
|
||||
echo " --clean Switch specifying not to install anything, but cleanup native asset folders"
|
||||
echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure"
|
||||
echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure"
|
||||
echo " --donotabortonfailure Switch specifying whether to abort native tools installation on failure"
|
||||
echo " --donotdisplaywarnings Switch specifying whether to display warnings during native tools installation on failure"
|
||||
echo " --force Clean and then install tools"
|
||||
echo " --help Print help and exit"
|
||||
echo ""
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
|
||||
<!-- Clear references, the SDK may add some depending on UsingToolXxx settings, but we only want to restore the following -->
|
||||
<PackageReference Remove="@(PackageReference)"/>
|
||||
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
|
||||
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ parameters:
|
|||
# 'continueOnError', the parameter value is not correctly picked up.
|
||||
# This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
|
||||
sdlContinueOnError: false # optional: determines whether to continue the build if the step errors;
|
||||
downloadArtifacts: true # optional: determines if the artifacts should be dowloaded
|
||||
downloadArtifacts: true # optional: determines if the artifacts should be downloaded
|
||||
dependsOn: '' # Optional: dependencies of the job
|
||||
artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts
|
||||
# Usage:
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ ARG USER_ID=0
|
|||
RUN adduser code_executor -u ${USER_ID} -G root -D
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permssions on these directories
|
||||
# With the User Change, we need to change permissions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ ARG USER_ID=0
|
|||
RUN useradd -m code_executor -u ${USER_ID} -g root
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permssions on these directories
|
||||
# With the User Change, we need to change permissions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
RUN chmod -R 755 /usr/bin/sudo
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ ARG USER_ID=0
|
|||
RUN useradd -m code_executor -u ${USER_ID} -g root
|
||||
RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
# With the User Change, we need to change permssions on these directories
|
||||
# With the User Change, we need to change permissions on these directories
|
||||
RUN chmod -R a+rwx /usr/local
|
||||
RUN chmod -R a+rwx /home
|
||||
RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
|
||||
<GenerateDependencyFile>false</GenerateDependencyFile>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<GenerateRuntimeCofigurationFiles>false</GenerateRuntimeCofigurationFiles>
|
||||
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
|
||||
<AssemblyName>UNUSED</AssemblyName>
|
||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
|
||||
<GenerateDependencyFile>false</GenerateDependencyFile>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<GenerateRuntimeCofigurationFiles>false</GenerateRuntimeCofigurationFiles>
|
||||
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
|
||||
<AssemblyName>UNUSED</AssemblyName>
|
||||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ namespace Microsoft.DotNet.Build.Tasks
|
|||
|
||||
// Build the full list of parameters
|
||||
FPMParameters = BuildCmdParameters(configJson, PackageVersion);
|
||||
Log.LogMessage(MessageImportance.Normal, "Generated RPM paramters: " + FPMParameters);
|
||||
Log.LogMessage(MessageImportance.Normal, "Generated RPM parameters: " + FPMParameters);
|
||||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
|
|
@ -113,7 +113,7 @@ namespace Microsoft.DotNet.Build.Tasks
|
|||
// --iteration : the iteration to give to the package. This comes from the package_revision --JSON
|
||||
// --url : url for this package. --JSON
|
||||
// --verbose : Set verbose output for FPM tool --Static
|
||||
// <All folder mappings> : Add all the folder mappings for packge_root, docs, man pages --Static
|
||||
// <All folder mappings> : Add all the folder mappings for package_root, docs, man pages --Static
|
||||
|
||||
var parameters = new List<string>();
|
||||
parameters.Add("-s dir");
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Build.Tasks
|
|||
// occasionally formatted as something that base would recognize as
|
||||
// a canonically formatted warning anyway.
|
||||
//
|
||||
// One thing that is consistent is that crossgne errors go to stderr
|
||||
// One thing that is consistent is that crossgen errors go to stderr
|
||||
// and everything else goes to stdout. Above, we set stderr to high
|
||||
// importance above, and stdout to normal. So we can use that here
|
||||
// to distinguish between errors and messages.
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Build.Tasks
|
|||
catch (Exception e)
|
||||
{
|
||||
// We have 2 log calls because we want a nice error message but we also want to capture the callstack in the log.
|
||||
Log.LogError("An exception has occured while trying to compress '{0}' into '{1}'.", SourceDirectory, DestinationArchive);
|
||||
Log.LogError("An exception has occurred while trying to compress '{0}' into '{1}'.", SourceDirectory, DestinationArchive);
|
||||
Log.LogMessage(MessageImportance.Low, e.ToString());
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ extern "C" HRESULT RemoveDependent(LPWSTR sczDependent, BOOL* pbRestartRequired)
|
|||
hr = RegOpen(hkProviderKey, L"Dependents", KEY_READ | KEY_WRITE, &hkDependentsKey);
|
||||
if (E_FILENOTFOUND == hr)
|
||||
{
|
||||
// Providers can sometimes become orphaned duirng uninstalls. If there's no Dependents subkey, we just
|
||||
// Providers can sometimes become orphaned during uninstalls. If there's no Dependents subkey, we just
|
||||
// release the handle and continue to the next provider key.
|
||||
hr = S_OK;
|
||||
ReleaseRegKey(hkProviderKey);
|
||||
|
|
@ -90,9 +90,9 @@ extern "C" HRESULT RemoveDependent(LPWSTR sczDependent, BOOL* pbRestartRequired)
|
|||
ExitOnFailure(hr, "Unable to open dependents key.");
|
||||
|
||||
// Enumerate over all the dependent keys
|
||||
for (DWORD dwDepdentsKeyIndex = 0;; ++dwDepdentsKeyIndex)
|
||||
for (DWORD dwDependentsKeyIndex = 0;; ++dwDependentsKeyIndex)
|
||||
{
|
||||
hr = RegKeyEnum(hkDependentsKey, dwDepdentsKeyIndex, &sczDependentsKey);
|
||||
hr = RegKeyEnum(hkDependentsKey, dwDependentsKeyIndex, &sczDependentsKey);
|
||||
|
||||
if (E_NOMOREITEMS == hr)
|
||||
{
|
||||
|
|
@ -110,7 +110,7 @@ extern "C" HRESULT RemoveDependent(LPWSTR sczDependent, BOOL* pbRestartRequired)
|
|||
ExitOnFailure(hr, "Failed to delete dependent \"%ls\"", sczDependent);
|
||||
LogStringLine(REPORT_STANDARD, " Dependent deleted");
|
||||
// Reset the index since we're deleting keys while enumerating
|
||||
dwDepdentsKeyIndex = dwDepdentsKeyIndex > 1 ? dwDepdentsKeyIndex-- : 0;
|
||||
dwDependentsKeyIndex = dwDependentsKeyIndex > 1 ? dwDependentsKeyIndex-- : 0;
|
||||
|
||||
// Check if there are any subkeys remaining under the dependents key. If not, we
|
||||
// can uninstall the MSI. We'll recheck the key again in case the MSI fails to clean up the
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
<ArtifactNameWithVersionMSBuildExtensions>dotnet-standard-support-vs2015-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionMSBuildExtensions>
|
||||
<ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
|
||||
<!-- Warning: changing the value "ProductBandCombinedHostHostFxrFrameworkSdkName" can only occur on a product-band boundary [CliProductBandVersion],
|
||||
Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradablilty of the SDK bundle installer. -->
|
||||
Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. -->
|
||||
<ProductBandCombinedHostHostFxrFrameworkSdkName>Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid)</ProductBandCombinedHostHostFxrFrameworkSdkName>
|
||||
<DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<!--<DisableImplicitAssetTargetFallback>true</DisableImplicitAssetTargetFallback>-->
|
||||
|
||||
<!-- NU1701: Disable asset target fallback warning globally since it does not work transitively on NoWarn of individual packages -->
|
||||
<!-- Since we disabled the implict fallback to net461, this will only kick in when we have an explicit fallback and we don't need to be warned about it doing what we asked it to do. -->
|
||||
<!-- Since we disabled the implicit fallback to net461, this will only kick in when we have an explicit fallback and we don't need to be warned about it doing what we asked it to do. -->
|
||||
<!-- NU5104: Disable 'A stable release of a package should not have a prerelease dependency' warning globally -->
|
||||
<!-- The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' throws a "NU5104" warning/error while using a "2.1.300" stage0 SDK. For: Linux-x64, Linux-arm, and Linux-arm64 -->
|
||||
<!--<NoWarn>NU1701;NU5104</NoWarn>-->
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ function RunHeat
|
|||
# -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as exception list name.
|
||||
# Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file
|
||||
# path, and file path has version number)
|
||||
# use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
|
||||
# use XSLT transform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
|
||||
|
||||
$heatOutput = .\heat.exe dir `"$inputDir`" -template fragment `
|
||||
-sreg -ag `
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@
|
|||
<RuntimeTargetDirectory>$(DotnetToTestPath)shared\Microsoft.NETCore.App\$(RuntimeVersionToInstall)</RuntimeTargetDirectory>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
|
||||
<!-- Set TLS1.2 explicitly before running this. If TLS1.2 isnt' enbabled by default this command may fail in some
|
||||
<!-- Set TLS1.2 explicitly before running this. If TLS1.2 isnt' enabled by default this command may fail in some
|
||||
scenarios. Waiting on a fix to dotnet-install.ps1 to fix this in the right place. -->
|
||||
<InstallRuntimeCommand>powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& {</InstallRuntimeCommand>
|
||||
<InstallRuntimeCommand>$(InstallRuntimeCommand) [Net.ServicePointManager]::SecurityProtocol = 'Tls12, Tls13';</InstallRuntimeCommand>
|
||||
|
|
@ -292,7 +292,7 @@
|
|||
<Target Name="RuntimeImplementationProjectOutputGroup" />
|
||||
<!-- Group always attempts resolve runtime, regardless of <CopyNuGetImplementations>-->
|
||||
<Target Name="GetReferenceAssemblyPaths" />
|
||||
<!-- Don't go looking for framewoek reference assemblies-->
|
||||
<!-- Don't go looking for framework reference assemblies-->
|
||||
<Target Name="GetFrameworkPaths" />
|
||||
<!-- ^ -->
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ To generate the table of [SDK per check in build download table](https://github.
|
|||
1. Edit the `inputBranches` in Program.fs when there is a new branch created. Make edits to table.fs if there are changes to the specific items or order you want showing up.
|
||||
2. Run the program, it will generate the table with updated branch. It is not too smart, so if there is new platform added, we need more to change the program. But it is still better than edit it by hand.
|
||||
3. Replace the table in the main readme file https://github.com/dotnet/installer/blob/main/README.md
|
||||
NOTE: The output does not replace the entire file so you have to copy/paste over the pieces that are generated which is the middle of hte file
|
||||
NOTE: The output does not replace the entire file so you have to copy/paste over the pieces that are generated which is the middle of the file
|
||||
4. Run tests and update the tests
|
||||
|
||||
I wrote it to learn F#, since it is almost the "99 bottle of beer" kata. Please point out places I can improve if you are interested.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let ``it can Shorten main branch Name``() =
|
|||
branchNameShorten branch |> should equal "main"
|
||||
|
||||
[<Fact>]
|
||||
let ``it can Shorten releae branch Name``() =
|
||||
let ``it can Shorten release branch Name``() =
|
||||
let branch =
|
||||
{ GitBranchName = "release/3.1.1xx"
|
||||
DisplayName = "Release/3.1.1XX<br>(3.1.x Runtime)"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue