Skip to content

Commit

Permalink
Better .nupkg names
Browse files Browse the repository at this point in the history
  • Loading branch information
robmen committed Mar 7, 2024
1 parent a8504dc commit 8e744ec
Show file tree
Hide file tree
Showing 324 changed files with 534 additions and 607 deletions.
10 changes: 3 additions & 7 deletions src/api/api.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ msbuild api_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\api_b
:: Test
dotnet test ^
%_B%\net6.0\WixToolsetTest.Data.dll ^
%_B%\net6.0\win-x86\WixToolsetTest.Mba.Core.dll ^
%_B%\net6.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^
%_B%\x86\BalUtilUnitTest.dll ^
%_B%\x86\BextUtilUnitTest.dll ^
--nologo -l "trx;LogFileName=%_L%\TestResults\api.trx" || exit /b
Expand All @@ -37,19 +37,15 @@ dotnet test ^

:clean
@rd /s/q "..\..\build\api" 2> nul
@del "..\..\build\artifacts\WixToolset.BalUtil.*.nupkg" 2> nul
@del "..\..\build\artifacts\WixToolset.BextUtil.*.nupkg" 2> nul
@del "..\..\build\artifacts\WixToolset.BootstrapperCore.Native.*.nupkg" 2> nul
@del "..\..\build\artifacts\WixToolset.Data.*.nupkg" 2> nul
@del "..\..\build\artifacts\WixToolset.Extensibility.*.nupkg" 2> nul
@del "..\..\build\artifacts\WixToolset.Mba.Core.*.nupkg" 2> nul
@del "..\..\build\artifacts\WixToolset.BootstrapperApplicationApi.*.nupkg" 2> nul
@del "%_L%\TestResults\api.trx" 2> nul
@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.balutil" 2> nul
@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bextutil" 2> nul
@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrappercore.native" 2> nul
@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.data" 2> nul
@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.extensibility" 2> nul
@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.mba.core" 2> nul
@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrapperapplicationapi" 2> nul
@exit /b

:end
Expand Down
4 changes: 2 additions & 2 deletions src/api/api.sln
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BalUtilUnitTest", "burn\tes
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BextUtilUnitTest", "burn\test\BextUtilUnitTest\BextUtilUnitTest.vcxproj", "{B69E6422-49B0-4E28-92F9-B8A7410A6ED9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BootstrapperApplicationApi", "burn\test\WixToolsetTest.BootstrapperApplicationApi\WixToolsetTest.BootstrapperApplicationApi.csproj", "{17DA3E92-40C5-4328-9BA5-1FE459A13719}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Mba.Core", "burn\WixToolset.Mba.Core\WixToolset.Mba.Core.csproj", "{47029283-43EC-4F22-9417-A02B28594912}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.BootstrapperApplicationApi", "burn\WixToolset.BootstrapperApplicationApi\WixToolset.BootstrapperApplicationApi.csproj", "{47029283-43EC-4F22-9417-A02B28594912}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.IO;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.CodeDom.Compiler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.ComponentModel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System.IO;

Expand All @@ -19,4 +19,4 @@ public interface IBootstrapperApplicationData
/// </summary>
IBundleInfo Bundle { get; }
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.CodeDom.Compiler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.CodeDom.Compiler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System.Collections.Generic;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.ComponentModel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System.Collections.Generic;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
/// <summary>
/// Overridable variable from the BA manifest.
Expand All @@ -12,4 +12,4 @@ public interface IOverridableVariableInfo
/// </summary>
string Name { get; }
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System.Collections.Generic;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
/// <summary>
/// Package information from the BA manifest.
Expand Down Expand Up @@ -68,7 +68,7 @@ public interface IPackageInfo
string PrereqLicenseUrl { get; }

/// <summary>
/// See <see cref="WixToolset.Mba.Core.PrimaryPackageType"/>
/// See <see cref="WixToolset.BootstrapperApplicationApi.PrimaryPackageType"/>
/// </summary>
PrimaryPackageType PrimaryPackageType { get; }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
/// <summary>
/// Managed bootstrapper application entry point.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;

internal static class MbaNative
{
[DllImport("mbanative.dll", ExactSpelling = true, PreserveSig = false)]
internal static extern void BootstrapperApplicationDebuggerCheck();
internal static extern void BalDebuggerCheck();

[DllImport("mbanative.dll", ExactSpelling = true, PreserveSig = false)]
internal static extern void BootstrapperApplicationRun(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
/// <summary>
/// Default implementation of <see cref="IOverridableVariableInfo"/>.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Collections.Generic;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.

namespace WixToolset.Mba.Core
namespace WixToolset.BootstrapperApplicationApi
{
using System;
using System.Runtime.InteropServices;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<AssemblyName>WixToolset.Mba.Core</AssemblyName>
<RootNamespace>WixToolset.Mba.Core</RootNamespace>
<AssemblyName>WixToolset.BootstrapperApplicationApi</AssemblyName>
<RootNamespace>WixToolset.BootstrapperApplicationApi</RootNamespace>
<DebugType>embedded</DebugType>
<Description>Managed Bootstrapper Application Core</Description>
<Description>Managed Bootstrapper Application API</Description>
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
<CreateDocumentationFile>true</CreateDocumentationFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@
<dependencies>
<group targetFramework=".NETFramework4.6.2" />
<group targetFramework=".NETStandard2.0" />
<group targetFramework="Native">
<dependency id="WixToolset.DUtil" version="[$version$,5)" />
</group>
</dependencies>
</metadata>

<files>
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />

<file src="$projectFolder$\build\WixToolset.BootstrapperApplicationApi.props" target="build\" />

<file src="$projectFolder$\build\_._" target="lib\native" />
<file src="net462\$id$.dll" target="lib\net462" />
<file src="net462\$id$.xml" target="lib\net462" />
<file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
Expand All @@ -28,5 +35,12 @@
<file src="v143\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
<file src="v143\x64\mbanative.dll" target="runtimes\win-x64\native" />
<file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />

<file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
<file src="$projectFolder$\..\inc\BootstrapperApplication.h" target="build\native\include" />
<file src="$projectFolder$\..\inc\BootstrapperEngine.h" target="build\native\include" />
<file src="v141\x86\balutil.lib" target="build\native\v14\x86" />
<file src="v141\x64\balutil.lib" target="build\native\v14\x64" />
<file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
</files>
</package>
Empty file.

This file was deleted.

Loading

0 comments on commit 8e744ec

Please sign in to comment.