Skip to content

Commit cc249de

Browse files
committed
Revert "Promote feature/v3 to main (#190)"
This reverts commit 4e5a8f5.
1 parent a84c3d7 commit cc249de

File tree

108 files changed

+726
-3983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+726
-3983
lines changed

.pipelines/pipeline.user.windows.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,16 @@ environment:
77

88
restore:
99
commands:
10-
- !!defaultcommand
11-
name: 'Install .NET'
12-
command: 'build/CallPowerShell.cmd'
13-
arguments: 'build/install-dotnet.ps1 -RestoreOnly'
1410
- !!defaultcommand
1511
name: 'Restore'
16-
command: 'build/CallPowerShell.cmd'
17-
arguments: 'build.ps1 -RestoreOnly'
12+
command: 'build.cmd'
13+
arguments: '-RestoreOnly'
1814

1915
build:
2016
commands:
2117
- !!buildcommand
2218
name: 'Dotnet Build'
23-
command: 'build/CallPowerShell.cmd'
24-
arguments: 'build.ps1'
19+
command: 'build.cmd'
2520
logs:
2621
- from: 'buildlogs'
2722
to: 'Build Logs'
@@ -37,8 +32,7 @@ package:
3732
commands:
3833
- !!buildcommand
3934
name: 'Dotnet Pack'
40-
command: 'build/CallPowerShell.cmd'
41-
arguments: 'pack.ps1'
35+
command: 'pack.cmd'
4236
logs:
4337
- from: 'buildlogs'
4438
to: 'Build Logs'
@@ -54,8 +48,7 @@ test:
5448
commands:
5549
- !!testcommand
5650
name: 'Dotnet Test'
57-
command: 'build/CallPowerShell.cmd'
58-
arguments: 'test.ps1'
51+
command: 'test.cmd'
5952
fail_on_stderr: false
6053
testresults:
6154
- title: 'Unit Tests'

Microsoft.FeatureManagement.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "examples\Cons
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TargetingConsoleApp", "examples\TargetingConsoleApp\TargetingConsoleApp.csproj", "{6558C21E-CF20-4278-AA08-EB9D1DF29D66}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomAssignmentConsoleApp", "examples\CustomAssignmentConsoleApp\CustomAssignmentConsoleApp.csproj", "{06C10E31-4C33-4567-85DB-00056A2BB511}"
23-
EndProject
2422
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorPages", "examples\RazorPages\RazorPages.csproj", "{BA29A1BB-81D5-4EB1-AF37-6ECF64AF27E2}"
2523
EndProject
2624
Global
@@ -53,10 +51,6 @@ Global
5351
{6558C21E-CF20-4278-AA08-EB9D1DF29D66}.Debug|Any CPU.Build.0 = Debug|Any CPU
5452
{6558C21E-CF20-4278-AA08-EB9D1DF29D66}.Release|Any CPU.ActiveCfg = Release|Any CPU
5553
{6558C21E-CF20-4278-AA08-EB9D1DF29D66}.Release|Any CPU.Build.0 = Release|Any CPU
56-
{06C10E31-4C33-4567-85DB-00056A2BB511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57-
{06C10E31-4C33-4567-85DB-00056A2BB511}.Debug|Any CPU.Build.0 = Debug|Any CPU
58-
{06C10E31-4C33-4567-85DB-00056A2BB511}.Release|Any CPU.ActiveCfg = Release|Any CPU
59-
{06C10E31-4C33-4567-85DB-00056A2BB511}.Release|Any CPU.Build.0 = Release|Any CPU
6054
{BA29A1BB-81D5-4EB1-AF37-6ECF64AF27E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6155
{BA29A1BB-81D5-4EB1-AF37-6ECF64AF27E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
6256
{BA29A1BB-81D5-4EB1-AF37-6ECF64AF27E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -70,7 +64,6 @@ Global
7064
{FDBB27BA-C5BA-48A7-BA9B-63159943EA9F} = {8ED6FFEE-4037-49A2-9709-BC519C104A90}
7165
{E50FB931-7A42-440E-AC47-B8DFE5E15394} = {FB5C34DF-695C-4DF9-8AED-B3EA2516EA72}
7266
{6558C21E-CF20-4278-AA08-EB9D1DF29D66} = {FB5C34DF-695C-4DF9-8AED-B3EA2516EA72}
73-
{06C10E31-4C33-4567-85DB-00056A2BB511} = {FB5C34DF-695C-4DF9-8AED-B3EA2516EA72}
7467
{BA29A1BB-81D5-4EB1-AF37-6ECF64AF27E2} = {FB5C34DF-695C-4DF9-8AED-B3EA2516EA72}
7568
EndGlobalSection
7669
GlobalSection(ExtensibilityGlobals) = postSolution

README.md

Lines changed: 109 additions & 373 deletions
Large diffs are not rendered by default.

build.cmd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
call %~dp0build\ChoosePowerShell.cmd
2+
3+
IF %ERRORLEVEL% NEQ 0 (
4+
5+
exit /B 1
6+
)
7+
8+
%PowerShell% "%~dp0build.ps1" %*

build.ps1

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,15 @@ if ((Test-Path -Path $LogDirectory) -ne $true) {
2626
New-Item -ItemType Directory -Path $LogDirectory | Write-Verbose
2727
}
2828

29-
$dotnet = & "$PSScriptRoot/build/resolve-dotnet.ps1"
30-
3129
if ($RestoreOnly)
3230
{
3331
# Restore
34-
& $dotnet restore "$Solution"
32+
dotnet restore "$Solution"
3533
}
3634
else
3735
{
3836
# Build
39-
& $dotnet build -c $BuildConfig "$Solution" | Tee-Object -FilePath "$LogDirectory\build.log"
37+
dotnet build -c $BuildConfig "$Solution" | Tee-Object -FilePath "$LogDirectory\build.log"
4038
}
4139

4240
exit $LASTEXITCODE

build/CallPowerShell.cmd

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/ChoosePowerShell.cmd

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
:: where.exe does not exist in windows container, application specific test must be used to check for existence
2+
3+
pwsh -Command Write-Host "a"
4+
5+
IF %ERRORLEVEL% == 0 (
6+
7+
set PowerShell=pwsh
8+
9+
exit /B 0
10+
)
11+
12+
PowerShell -Command Write-Host "a"
13+
14+
IF %ERRORLEVEL% == 0 (
15+
16+
set PowerShell=PowerShell
17+
18+
exit /B 0
19+
)
20+
21+
echo Could not find a suitable PowerShell executable.
22+
23+
EXIT /B 1

build/install-dotnet.ps1

Lines changed: 0 additions & 8 deletions
This file was deleted.

build/resolve-dotnet.ps1

Lines changed: 0 additions & 14 deletions
This file was deleted.

docs/schemas/FeatureManagement.v1.0.0.json

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)