Skip to content

Move Raven35 persistence.manifest to LegacyArtifacts #3737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidBoike merged 3 commits into from
Oct 11, 2023
Merged

Move Raven35 persistence.manifest to LegacyArtifacts #3737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77b7fc3
Move Raven35 persistence.manifest to LegacyArtifacts
DavidBoike Oct 10, 2023
c55b93c
Ignore test until later
DavidBoike Oct 10, 2023
4a701b1
Removed projects that no longer exist
ramonsmits Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/LegacyArtifacts/LegacyArtifacts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
</PropertyGroup>

<ItemGroup>
<!--
Manifest files from legacy transports/persistence are copied directly to the deploy directory,
while mimicking the same folder structure that exists in this project.
-->
<Artifact Include="**\*.manifest" DestinationFolder="$(ArtifactsPath)%(RecursiveDir)" />
</ItemGroup>
</Project>
0 ....Persistence.RavenDb/persistence.manifest → ...Persisters/RavenDB35/persistence.manifest
View file
Open in desktop
File renamed without changes.
0 ....Persistence.RavenDb/persistence.manifest → ...Persisters/RavenDB35/persistence.manifest
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/Persisters.Audit.Includes.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<ItemGroup Label="Persisters">
<ProjectReference Include="..\ServiceControl.Audit.Persistence.InMemory\ServiceControl.Audit.Persistence.InMemory.csproj" ReferenceOutputAssembly="false" Private="false" />
<ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb\ServiceControl.Audit.Persistence.RavenDb.csproj" ReferenceOutputAssembly="false" Private="false" />
<ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb5\ServiceControl.Audit.Persistence.RavenDb5.csproj" ReferenceOutputAssembly="false" Private="false" />
</ItemGroup>
</Project>
7 changes: 3 additions & 4 deletions src/Persisters.Primary.Includes.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>
<ItemGroup Label="Persisters">
<ProjectReference Include="..\ServiceControl.Persistence.RavenDb\ServiceControl.Persistence.RavenDb.csproj" ReferenceOutputAssembly="false" Private="false" />
<ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" ReferenceOutputAssembly="false" Private="false" />
</ItemGroup>
<ItemGroup Label="Persisters">
<ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" ReferenceOutputAssembly="false" Private="false" />
</ItemGroup>
</Project>
15 changes: 0 additions & 15 deletions src/ServiceControl.Audit.Persistence.RavenDb/ServiceControl.Audit.Persistence.RavenDb.csproj
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/ServiceControl.Persistence.RavenDb/ServiceControl.Persistence.RavenDb.csproj
View file
Open in desktop

This file was deleted.

46 changes: 14 additions & 32 deletions src/ServiceControl.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Persistence.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.AcceptanceTests.RavenDB5", "ServiceControl.AcceptanceTests.RavenDB5\ServiceControl.AcceptanceTests.RavenDB5.csproj", "{4F2CAFC7-113A-4D31-A365-6669AB4C7787}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{CFAF63BD-708E-4EB7-A55B-D80BCA67A589}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Audit.Persistence.RavenDb", "ServiceControl.Audit.Persistence.RavenDb\ServiceControl.Audit.Persistence.RavenDb.csproj", "{D6CE452A-1851-4F84-9880-0171000B04CD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Persistence.RavenDb", "ServiceControl.Persistence.RavenDb\ServiceControl.Persistence.RavenDb.csproj", "{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LegacyArtifacts", "LegacyArtifacts\LegacyArtifacts.csproj", "{38147B68-13EE-48DC-BB38-4217889978AE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -979,30 +975,18 @@ Global
{4F2CAFC7-113A-4D31-A365-6669AB4C7787}.Release|x64.Build.0 = Release|Any CPU
{4F2CAFC7-113A-4D31-A365-6669AB4C7787}.Release|x86.ActiveCfg = Release|Any CPU
{4F2CAFC7-113A-4D31-A365-6669AB4C7787}.Release|x86.Build.0 = Release|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x64.ActiveCfg = Debug|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x64.Build.0 = Debug|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x86.ActiveCfg = Debug|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Debug|x86.Build.0 = Debug|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|Any CPU.Build.0 = Release|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x64.ActiveCfg = Release|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x64.Build.0 = Release|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x86.ActiveCfg = Release|Any CPU
{D6CE452A-1851-4F84-9880-0171000B04CD}.Release|x86.Build.0 = Release|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x64.ActiveCfg = Debug|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x64.Build.0 = Debug|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x86.ActiveCfg = Debug|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Debug|x86.Build.0 = Debug|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|Any CPU.Build.0 = Release|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x64.ActiveCfg = Release|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x64.Build.0 = Release|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x86.ActiveCfg = Release|Any CPU
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6}.Release|x86.Build.0 = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x64.ActiveCfg = Debug|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x64.Build.0 = Debug|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x86.ActiveCfg = Debug|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Debug|x86.Build.0 = Debug|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|Any CPU.Build.0 = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x64.ActiveCfg = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x64.Build.0 = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x86.ActiveCfg = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1082,9 +1066,7 @@ Global
{84627DC0-7B43-480D-80CF-A4DDA514A4EE} = {9B52418E-BF18-4D25-BE17-4B56D3FB1154}
{2EF143A5-E769-42FD-8B7E-7C01C381BC13} = {350F72AB-142D-4AAD-9EF1-1A83DC991D87}
{4F2CAFC7-113A-4D31-A365-6669AB4C7787} = {350F72AB-142D-4AAD-9EF1-1A83DC991D87}
{CFAF63BD-708E-4EB7-A55B-D80BCA67A589} = {55C388DD-2B39-4C2F-AEBD-AFD3444815F1}
{D6CE452A-1851-4F84-9880-0171000B04CD} = {CFAF63BD-708E-4EB7-A55B-D80BCA67A589}
{B50D94DF-3D25-4AFA-B58C-EC9441A759B6} = {CFAF63BD-708E-4EB7-A55B-D80BCA67A589}
{38147B68-13EE-48DC-BB38-4217889978AE} = {55C388DD-2B39-4C2F-AEBD-AFD3444815F1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3B9E5B72-F580-465A-A22C-2D2148AF4EB4}
Expand Down
4 changes: 2 additions & 2 deletions src/ServiceControlInstaller.Engine.UnitTests/Configuration/AuditInstanceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
[TestFixture]
class AuditInstanceTests : InstallationFixture
{
// TODO: Revisit this test once installer work is done to make Raven35 instances non-upgradeable
[Test]
// TODO: Revisit this test once installer work is done to make Raven35 instances non-upgradeable, and remove Ignore attribute
[Test, Ignore("Revisit when installer makes Raven35 instances non-upgradeable")]
public void Should_default_to_raven35_when_no_config_entry_exists()
{
var newInstance = ServiceControlAuditNewInstance.CreateWithPersistence(ZipFileFolder.FullName, "RavenDB35");
Expand Down
6 changes: 4 additions & 2 deletions src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@

<ItemGroup Label="Audit persisters">
<ProjectReference Include="..\ServiceControl.Audit.Persistence.InMemory\ServiceControl.Audit.Persistence.InMemory.csproj" />
<ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb\ServiceControl.Audit.Persistence.RavenDb.csproj" />
<ProjectReference Include="..\ServiceControl.Audit.Persistence.RavenDb5\ServiceControl.Audit.Persistence.RavenDb5.csproj" />
</ItemGroup>

<ItemGroup Label="Primary persisters">
<ProjectReference Include="..\ServiceControl.Persistence.RavenDb5\ServiceControl.Persistence.RavenDb5.csproj" />
<ProjectReference Include="..\ServiceControl.Persistence.RavenDb\ServiceControl.Persistence.RavenDb.csproj" />
</ItemGroup>

<ItemGroup Label="Transports">
Expand All @@ -32,6 +30,10 @@
<ProjectReference Include="..\ServiceControl.Transports.SQS\ServiceControl.Transports.SQS.csproj" />
</ItemGroup>

<ItemGroup Label="Manifests for removed stuff">
<ProjectReference Include="..\LegacyArtifacts\LegacyArtifacts.csproj" />
</ItemGroup>

<ItemGroup>
<!-- This ensures that all the project references listed above are configured to be build ordering references only.
No assemblies or content are copied when these are set -->
Expand Down